-
-
Notifications
You must be signed in to change notification settings - Fork 40
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
Rename unstable
to main
throughout codebase
#1990
Conversation
Codecov Report
@@ Coverage Diff @@
## main #1990 +/- ##
==========================================
- Coverage 77.83% 77.82% -0.02%
==========================================
Files 418 418
Lines 12813 12789 -24
Branches 584 566 -18
==========================================
- Hits 9973 9953 -20
+ Misses 2840 2836 -4
Continue to review full report at Codecov.
|
.github/workflows/deploy.yml
Outdated
- master | ||
# TODO Remove once deploying unstable versions separately |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is cleanup from long ago :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Question, what happens to all the PRs in flight? Does GH know to change "XYZ wants to merge N commits into unstable
from branch
" or do they break?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea! I don't see any major issues with that, except that we would have to manually retarget active pull requests against trunk
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I support moving away from unstable
, but isn't trunk
a very Subversion-y name?
Both Git and GitHub use main
as the default branch name.
We also already use |
We’ll have to change the branch they are targeting the pending prs. |
Ah good point. When the change away from master was happing, I configured my git config to use trunk, and I prefer it cause it fits with the branching metaphor, but forgot that it is less common. I’ll change this to |
The advice was out of date with our current development practices, and didn't make sense with the name switch of the development branch from `unstable` to `main`.
dbf13fd
to
a5a479a
Compare
unstable
to main
throughout codebase
Changed this to target |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
Closes #1012
NOTE: This PR is into the new branch named
main
, which will be made the default once this PR is is approved by the team.Overview
The trunk of our development has been called
unstable
for a long time.This is a holdover from before we adopted a trunk-based development
model, and from before we had CI/CD running for the trunk. Now, the
trunk is really not very unstable, and stability is given by versioned
releases, rather than by maintaining long-lived branches in parallel.
After this change, we should be able to reconfigure the default branch.
Notable changes
unstable
branch tomain
Reviewing
With the exception of the update to the docker installation instructions and the changelog entry (both isolated in their own commits), the change effected here was purely mechanical, with the exception of the changelog entry. It couldn't hurt to have some sanity checks that I've not missed anything or altered anything I shouldn't have.