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

Switch default branch from master to main #399

Merged
merged 5 commits into from
Dec 11, 2020

Conversation

dhimmel
Copy link
Member

@dhimmel dhimmel commented Dec 10, 2020

refs #349

Switch default branch from master to main, while maintaining support for existing manuscripts that continue using master branch.

TODO:

@dhimmel dhimmel force-pushed the master-to-main branch 6 times, most recently from 6620029 to 5a2052a Compare December 10, 2020 15:32
Goal is to make CI scripts work with a default branch of main or
master.

notes:

`git symbolic-ref refs/remotes/origin/HEAD` worked locally but not
on GitHub actions.

references:

- actions/checkout#283 (comment)
- https://github.com/thoughtbot/dotfiles/blob/2a59c1890f81bffc1db79cae4482ce2b706b0f79/bin/git-up
- https://github.com/actions/checkout/pull/284/files
- jhauberg/gitdoctor#3 (comment)
@manubot manubot deleted a comment from AppVeyorBot Dec 10, 2020
@manubot manubot deleted a comment from AppVeyorBot Dec 10, 2020
@manubot manubot deleted a comment from AppVeyorBot Dec 10, 2020
@manubot manubot deleted a comment from AppVeyorBot Dec 10, 2020
@manubot manubot deleted a comment from AppVeyorBot Dec 10, 2020
@manubot manubot deleted a comment from AppVeyorBot Dec 10, 2020
@manubot manubot deleted a comment from AppVeyorBot Dec 10, 2020
@AppVeyorBot
Copy link

AppVeyor build 1.0.204 ... for commit 667d170 is now complete.

Found 52 potential spelling error(s). Preview:content/02.delete-me.md:44:adipiscing
content/02.delete-me.md:44:aliqua
content/02.delete-me.md:44:amet
content/02.delete-me.md:44:consectetur
content/02.delete-me.md:44:dolore
content/02.delete-me.md:44:eiusmod
content/02.delete-me.md:44:elit
content/02.delete-me.md:44:incididunt
content/02.delete-me.md:44:ipsum
content/02.delete-me.md:44:labore
content/02.delete-me.md:44:Lorem
content/02.delete-me.md:44:magna
content/02 The rendered manuscript from this build is temporarily available for download at:

ci/deploy.sh Outdated Show resolved Hide resolved
dhimmel and others added 2 commits December 10, 2020 10:54
Co-authored-by: Anthony Gitter <agitter@users.noreply.github.com>
this commit assumes we create a main branch and merge this PR to
main
@AppVeyorBot
Copy link

AppVeyor build 1.0.205 for commit 4eea32b is now complete.

Found 52 potential spelling error(s). Preview:content/02.delete-me.md:44:adipiscing
content/02.delete-me.md:44:aliqua
content/02.delete-me.md:44:amet
content/02.delete-me.md:44:consectetur
content/02.delete-me.md:44:dolore
content/02.delete-me.md:44:eiusmod
content/02.delete-me.md:44:elit
content/02.delete-me.md:44:incididunt
content/02.delete-me.md:44:ipsum
content/02.delete-me.md:44:labore
content/02.delete-me.md:44:Lorem
content/02.delete-me.md:44:magna
content/02...
The rendered manuscript from this build is temporarily available for download at:

@dhimmel dhimmel changed the base branch from master to main December 10, 2020 23:21
manubot/manubot@55c5e1e
updates get_rootstock_commit to search the main branch rootstock
commits.
Copy link
Member

@agitter agitter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Adding a note to setup before merging is a good idea.

@@ -5,6 +5,7 @@ services:
- docker
branches:
only:
- main
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This legacy workflow could run on main but will only deploy when run on master. That's potentially inconsistent, but I don't think it is a problem. As you note, this is a legacy workflow.

@AppVeyorBot
Copy link

AppVeyor build 1.0.206 for commit 08772ef is now complete.

Found 52 potential spelling error(s). Preview:content/02.delete-me.md:44:adipiscing
content/02.delete-me.md:44:aliqua
content/02.delete-me.md:44:amet
content/02.delete-me.md:44:consectetur
content/02.delete-me.md:44:dolore
content/02.delete-me.md:44:eiusmod
content/02.delete-me.md:44:elit
content/02.delete-me.md:44:incididunt
content/02.delete-me.md:44:ipsum
content/02.delete-me.md:44:labore
content/02.delete-me.md:44:Lorem
content/02.delete-me.md:44:magna
content/02...
The rendered manuscript from this build is temporarily available for download at:

@dhimmel dhimmel merged commit 690aac1 into manubot:main Dec 11, 2020
@dhimmel dhimmel deleted the master-to-main branch December 11, 2020 00:39
ploegieku added a commit to ploegieku/2023-functional-homology-paper that referenced this pull request Aug 6, 2024
merges manubot/rootstock#399
closes manubot/rootstock#349

Co-authored-by: Anthony Gitter <agitter@users.noreply.github.com>
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

Successfully merging this pull request may close these issues.

4 participants