-
Notifications
You must be signed in to change notification settings - Fork 171
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 name to main in docs/ci #8210
Conversation
e0d4e7a
to
7c0ae42
Compare
1bd9d60
to
4cf10e4
Compare
4cf10e4
to
02810cf
Compare
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.
Generally LGTM. Changelog needs to be rebased. The only other place where I see instances that might need to be changed to "main" is in the Jenkinsfiles - can you check those, or is there a reason they don't need updating?
e683149
to
594ee71
Compare
Thanks and good question. Thanks for finding those references to the branch name. I updated them in this PR. @jhunkeler are there other jenkins/bytesalad (or other systems) that will need to be updated for a new default branch name? |
On the Jenkins side we'd need to change the branch from master to main for each pipeline. Feel free to ping me whenever you want to change this. |
594ee71
to
32bbdea
Compare
Rebasing and leaving off a changelog until #8671 can be merged |
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.
Docs changes look good to me. It will be nice to get this settled!
What is the status on all the various coordination needed?
Thanks. I think we're all set since github will redirect requests to master to main. |
32bbdea
to
e484164
Compare
I'm happy to get this merged today. If we do so, we'll need to update the Jenkins instances to point to main afterwards, correct @jhunkeler ? Any other blockers remaining pre/post merge? |
Do the GA regression tests need updating too? |
After the branch rename the one reference to 'master' here can be updated: I'll update the list in the description with checkboxes. |
FWIW I do not have permissions to rename the branch (the required first step prior to merging this PR). @tapastro @melanieclarke do either of you have permissions? If not @jhunkeler may. |
It looks like we probably can - jwst-pipeline-maintainers have the admin role - but I'm a little uncomfortable touching the GitHub branches myself. Joe also has admin role, and Zach too. |
Thanks for checking. Any objection to going forward with the branch rename? One option could be to:
|
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.
Okay by me to move forward as @braingram suggests.
alright, I'll go ahead and rename the |
done! |
Thanks @zacharyburnett Would you also force merge this PR? |
UNLIMITED POWER!!! |
This PR updates the CI and docs to refer to a renamed "main" branch.
Unlike spacetelescope/stdatamodels#247 and spacetelescope/stpipe#136 it is likely that downstream packages are referring to the current default branch. For some period of time (I cannot find a statement that define for how long), github will redirect these requests to the renamed branch.
Known downstream uses will be listed here:
For developers, they will need to update their local clones and forks to match the new default branch.
Once the issue of updating packages that use the current jwst default branch is addressed, we should be able to:
It's possible codecov may need to be updated to use "main" (if it's not using the default branch).
The order of operations is:
Note that the items in the above checklist after merging this PR can be done in any order and aren't urgent as all will continue to work (with github redirecting requests directed to the old branch to the new branch).
Checklist for maintainers
CHANGES.rst
within the relevant release sectionHow to run regression tests on a PR