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

Migrate default branch from master to main #681

Closed
15 tasks done
vdemeester opened this issue Jan 18, 2021 · 1 comment
Closed
15 tasks done

Migrate default branch from master to main #681

vdemeester opened this issue Jan 18, 2021 · 1 comment
Assignees
Labels
area/plumbing Issues or PRs related to the plumbing infrastructure but needing attention in a non-plumbing repo. kind/misc Categorizes issue or PR as a miscellaneuous one.

Comments

@vdemeester
Copy link
Member

vdemeester commented Jan 18, 2021

Last year, we talked a little bit about renaming the master branch to main for all the
tektoncd projects. So far, we change the organization settings to make all new repository
use main as default branch. The only two repository that are using main as default
branch are tektoncd/results and tektoncd/operator.

As promised last year, GitHub has delivered a feature to rename the master branch to main1 and since later last week, it is now finally available ! We can thus move on to our plan :).
According to the GitHub documentation, it will "redirect web requests for the old branch name to the new branch name". This means however, that any script, plumbing, tooling that is working on master might fail after renaming. So the plan is the following:


For each repository, the process should go as follow:

  • a PR is opened to make any tooling/script work with the main branch (as well as with
    master as much as we can)
  • (once this PR is merged), we proceed to the branch renaming, using the GitHub feature
    (so that we get the redirection, changing PR base, …)…
  • … and we update our CI setup (prow and/or tekton-based CI) to target/use main instead of
    master.
  • we update any reference in our project to the migrated repository to use main instead of
    master (e.g. link to the community files).

Worst case, we "fail, learn and repeat" 😉.

The current proposed timeline is the following:


/area plumbing
/kind misc
/assign

@tekton-robot tekton-robot added area/plumbing Issues or PRs related to the plumbing infrastructure but needing attention in a non-plumbing repo. kind/misc Categorizes issue or PR as a miscellaneuous one. labels Jan 18, 2021
@bobcatfish
Copy link
Contributor

Thanks for taking on this important work @vdemeester !!!!

image

vdemeester added a commit to vdemeester/tektoncd-plumbing that referenced this issue Feb 3, 2021
This updates any reference to tektoncd/community master branch to main
as we are renaming branches.

Related to tektoncd#681

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
vdemeester added a commit to vdemeester/tektoncd-plumbing that referenced this issue Feb 3, 2021
This updates any reference to tektoncd/community master branch to main
as we are renaming branches.

Related to tektoncd#681

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
vdemeester added a commit to vdemeester/tektoncd-plumbing that referenced this issue Feb 3, 2021
This updates any reference to tektoncd/community master branch to main
as we are renaming branches.

Related to tektoncd#681

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
vdemeester added a commit to vdemeester/tektoncd-plumbing that referenced this issue Feb 3, 2021
This updates any reference to tektoncd/plumbing master branch to main
as we are renaming branches.

This is gonna be a bit of a "chicken-and-egg" situation, so we may
need to get this in "just" after renaming and apply things manually to
get everything back up correctly.

Related to tektoncd#681

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
tekton-robot pushed a commit that referenced this issue Feb 4, 2021
This updates any reference to tektoncd/plumbing master branch to main
as we are renaming branches.

This is gonna be a bit of a "chicken-and-egg" situation, so we may
need to get this in "just" after renaming and apply things manually to
get everything back up correctly.

Related to #681

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
tekton-robot pushed a commit that referenced this issue Feb 9, 2021
This updates any reference to tektoncd/community master branch to main
as we are renaming branches.

Related to #681

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/plumbing Issues or PRs related to the plumbing infrastructure but needing attention in a non-plumbing repo. kind/misc Categorizes issue or PR as a miscellaneuous one.
Projects
None yet
Development

No branches or pull requests

3 participants