Rename master branch to main #24717
Rename master branch to main #24717
Conversation
maintainer-s-little-helper
bot
added
the
dont-merge/needs-release-note-label
joestringer
added
the
release-note/misc
maintainer-s-little-helper
bot
removed
the
dont-merge/needs-release-note-label
|
There's also the Jenkins configuration that will need to be updated. cc @nbusseneau |
|
we might also need to partially backport this to older releases, at least for documentation changes. |
joestringer
force-pushed
the
pr/joe/main-rename
branch
from
0154884
to
896804a
Compare
|
/test |
joestringer
requested review from
nebril,
zacharysarah,
NikAleksandrov and
brlbil
joestringer
added
the
dont-merge/waiting-for-user-feedback
There was a problem hiding this comment.
So glad to see this work happening. 🌟 I have one question about whether renaming the file linked in .github/ISSUE_TEMPLATE/failing_test_jenkins_template.yaml needs to happen in this PR, or whether it will happen separately. Otherwise, no explicit changes required, LGTM from a docs perspective.
| @@ -28,7 +28,7 @@ Cilium Committer Grant/Revocation Policy | |||
| ======================================== | |||
|
|
|||
| A Cilium committer is a participant in the project with the ability to | |||
| commit code directly to the master repository. Commit access grants a | |||
| commit code directly to the main branch. Commit access grants a | |||
| If a bug is present on main and other branches, fix it on main first, | ||
| then backport the fix to other branches. Straightforward backports | ||
| do not require additional review (beyond that for the fix on main). |
There was a problem hiding this comment.
Just want to call this out as a great example of straightforward, clear writing. ✨
There was a problem hiding this comment.
I'll pass those kudos back to the community :-) In this PR, I'm just a fancy version of sed.
Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Joe Stringer <joe@cilium.io>
joestringer
force-pushed
the
pr/joe/main-rename
branch
from
896804a
to
ae44eff
Compare
|
Tests previously passed, I just had to rebase due to a minor conflict in |
joestringer
removed
the
dont-merge/waiting-for-user-feedback
| @@ -7,7 +7,7 @@ require_linux | |||
|
|
|||
| ORG=${ORG:-"cilium"} | |||
| REPO=${REPO:-"cilium"} | |||
| BRANCH=${BRANCH:-"master"} | |||
| BRANCH=${BRANCH:-"main"} | |||
There was a problem hiding this comment.
We probably also want this change in the stable branches. And I bet there's a whole bunch of similar changes across the PR ...
There was a problem hiding this comment.
I think we should already be fine as we already handle this as part of the stable branching process (e.g. workflow files get the main/master references replaced with the stable branch name), and I don't think there's anything outside of that that requires additional changes following the rename of master to main.
There was a problem hiding this comment.
I think Julian is highlighting that his workflow is to use the cherry-pick script from an older branch which doesn't yet have these changes. Personally I always use the contrib/ scripts from main branch (using git worktree to share the git repo with multiple copies per branch), but I appreciate that others have other workflows.
This will work with master for the next three months or so unless we either address this in all older branches or extend the master mirror longer. Bumping the cherry-pick script is simple enough, I can submit a PR for that. If you find any other broken workflows in future, feel free to send the PRs to fix those in the target branches.
In order to merge this PR, we would need to rename the default branch in the GitHub UI first.
Currently blocked on allocating a cutover date.
Fixes: #23110