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.

Sign up for GitHub

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

Jump to bottom

Rename git primary branch to "main" #23110

Closed
8 tasks done
squeed opened this issue Jan 16, 2023 · 5 comments · Fixed by #24717
Closed
8 tasks done

Rename git primary branch to "main" #23110

squeed opened this issue Jan 16, 2023 · 5 comments · Fixed by #24717
Labels
area/build Anything to do with the build, more general then area/CI kind/feature This introduces new functionality. pinned These issues are not marked stale by our issue bot. sig/agent Cilium agent related. sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages.

Comments

@squeed
Copy link
Contributor

squeed commented Jan 16, 2023 •
edited by joestringer

It's 2023.

Steps (feel free to add ones I missed):

pre-cut-over

  • Declare cutover day. Ideally not close to any deadlines :-)
    • April 18th, 2023
  • Prepare a PR that updates all relevant workflows in .github, .travis.yml, .jenkinsfiles
  • Fix up any scripts in contrib

cut-over day

followup

  • clean up references in docs
@squeed squeed added kind/feature This introduces new functionality. area/build Anything to do with the build, more general then area/CI labels Jan 16, 2023
@xmulligan xmulligan mentioned this issue Jan 16, 2023
Merged
@xmulligan
Copy link
Member

I might also add remove references to master from the docs

@xmulligan
Copy link
Member

cc: @margamanterola

@github-actions

This comment was marked as off-topic.

Sign in to view
@github-actions github-actions bot added the stale The stale bot thinks this issue is old. Add "pinned" label to prevent this from becoming stale. label Mar 19, 2023
@pchaigno pchaigno added pinned These issues are not marked stale by our issue bot. and removed stale The stale bot thinks this issue is old. Add "pinned" label to prevent this from becoming stale. labels Mar 19, 2023
@youngnick youngnick added sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. sig/agent Cilium agent related. labels Mar 21, 2023
@joestringer joestringer mentioned this issue Apr 3, 2023
Merged
@joestringer
Copy link
Member

I'm wondering about the step Mirror main to master with https://github.com/google/mirror-branch-action, github will redirect web requests or return error 301 for master branch so do we need to mirror it? cf. https://github.com/github/renaming#renaming-existing-branches

@joestringer joestringer mentioned this issue Apr 3, 2023
Merged
@squeed
Copy link
Contributor Author

squeed commented Apr 4, 2023

We only need to mirror main to master if there is tooling out there that expects a git branch named master (that we don't feel like tracking down). Accesses to individual files via the github web UI will be redirected, but anything that uses git will not.

@sayboras sayboras mentioned this issue Apr 5, 2023
Closed
@joestringer joestringer mentioned this issue Apr 18, 2023
Merged
@tklauser tklauser mentioned this issue Apr 19, 2023
Closed
tklauser added a commit to cilium/cilium-cli that referenced this issue Apr 19, 2023
@tklauser
Adjust cilium/cilium URLs after primary branch rename to main
c0ad08d 
Cilium's primary branch was renamed to `main`, see
cilium/cilium#23110. Adjust all URLs that
uses the old branch name.

Signed-off-by: Tobias Klauser <tobias@cilium.io>
tklauser added a commit to cilium/cilium-cli that referenced this issue Apr 20, 2023
@tklauser
Adjust cilium/cilium URLs after primary branch rename to main
2aeb35d 
Cilium's primary branch was renamed to `main`, see
cilium/cilium#23110. Adjust all URLs that
uses the old branch name.

Signed-off-by: Tobias Klauser <tobias@cilium.io>
@kaworu kaworu mentioned this issue May 11, 2023
Closed
michi-covalent pushed a commit to michi-covalent/cilium that referenced this issue May 30, 2023
@tklauser @michi-covalent
Adjust cilium/cilium URLs after primary branch rename to main
d7fcb1d 
Cilium's primary branch was renamed to `main`, see
cilium#23110. Adjust all URLs that
uses the old branch name.

Signed-off-by: Tobias Klauser <tobias@cilium.io>
kaworu added a commit to kaworu/github-actions that referenced this issue Aug 28, 2023
@kaworu
cmd: use main as default branch
e2e7cc8 
See cilium/cilium#23110

Signed-off-by: Alexandre Perrin <alex@isovalent.com>
aanm pushed a commit to cilium/github-actions that referenced this issue Aug 28, 2023
@kaworu @aanm
cmd: use main as default branch
35932b7 
See cilium/cilium#23110

Signed-off-by: Alexandre Perrin <alex@isovalent.com>
This was referenced May 31, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
area/build Anything to do with the build, more general then area/CI kind/feature This introduces new functionality. pinned These issues are not marked stale by our issue bot. sig/agent Cilium agent related. sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages.
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Rename master branch to main cilium/cilium
5 participants
@squeed @joestringer @pchaigno @youngnick @xmulligan