Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create manuscript repo without rootstock commit history #398

Closed
eric-czech opened this issue Dec 9, 2020 · 4 comments
Closed

Create manuscript repo without rootstock commit history #398

eric-czech opened this issue Dec 9, 2020 · 4 comments

Comments

@eric-czech
Copy link

Hey @dhimmel, OOC I tried creating a repo fresh instead of from a clone as suggested in https://github.com/manubot/rootstock/blob/master/SETUP.md. I did that to avoid bringing in the commit history from the rootstock repo. Is there a way to make this work? The first problem I ran into is in get_rootstock_commit when running build.sh.

Are there other ways you would recommend to keep the paper repo up-to-date with the template repo?

@eric-czech eric-czech changed the title Create manuscript repo without shared commit history Create manuscript repo without rootstock commit history Dec 9, 2020
@dhimmel dhimmel transferred this issue from manubot/manubot Dec 10, 2020
@dhimmel
Copy link
Member

dhimmel commented Dec 10, 2020

Hi Eric! We've played around with a squashing all rootstock commits upon creating a manuscript in #65. The main problem is that it becomes much harder to pull rootstock updates in the future.

avoid bringing in the commit history from the rootstock repo

I agree it's undesirable to clone the entire rootstock commit history. In the long-term, we hope to switch to using a GitHub template repo that would be located at https://github.com/manubot/template. But for now we don't have a great solution to creating a manuscript without the rootstock commit history.

The first problem I ran into is in get_rootstock_commit when running build.sh

Yes, get_rootstock_commit will fail without the entire rootstock commit history, which will cause a warning in the logs and prevent a metadata value from getting set. get_rootstock_commit might also fail if you've switched the default branch name from master to main (see #349). But despite being annoying in the logs, this warning can be ignored.

In summary, I'd caution against squashing everything to start unless you're willing to do extra maintenance work down the road. But if you'd like to squash, happy to help you debut any further issues.

The first problem I ran into is in get_rootstock_commit when running build.sh

Any subsequent issues?

@eric-czech
Copy link
Author

We've played around with a squashing all rootstock commits upon creating a manuscript in #65. The main problem is that it becomes much harder to pull rootstock updates in the future.

Ok, I'll use as intended then.

Any subsequent issues?

Nope! Had to replace master with main everywhere in manubot.yaml (so far only that), but the build.sh scripts runs without errors after rebasing on the latest rootstock commit.

@dhimmel
Copy link
Member

dhimmel commented Dec 10, 2020

Nice. This issue is in relation to https://github.com/pystatgen/sgkit-publication right?

@eric-czech
Copy link
Author

This issue is in relation to https://github.com/pystatgen/sgkit-publication right?

Yep.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants