Skip to content

Rename default branch #15915

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

Merged
merged 2 commits into from
Oct 25, 2022
Merged

Rename default branch #15915

merged 2 commits into from
Oct 25, 2022

Conversation

dvdksn
Copy link
Contributor

@dvdksn dvdksn commented Oct 19, 2022

Proposed changes

This PR updates the name of the default branch (from master to main) in files of the docs repository.

In addition to this PR, three additional changes must take place:

  • Update the ref name in the subject claim of the website_docs_docker_com Terraform module
  • Rename the branch on GitHub
  • Update the production branch name in Netlify

Only when the above changes are completed should this branch be merged. We should coordinate the changes as such that this PR is the first to get merged after the changes are made.

@dvdksn dvdksn requested a review from usha-mandya as a code owner October 19, 2022 13:56
@netlify
Copy link

netlify bot commented Oct 19, 2022

Deploy Preview for docsdocker ready!

Name Link
🔨 Latest commit 543abbe
🔍 Latest deploy log https://app.netlify.com/sites/docsdocker/deploys/635007317f51200009f1f1b7
😎 Deploy Preview https://deploy-preview-15915--docsdocker.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@dvdksn
Copy link
Contributor Author

dvdksn commented Oct 19, 2022

@crazy-max I think I caught all relevant occurrences of master here.

@usha-mandya
Copy link
Member

Thanks @dvdksn. I believe we should also update the workflows in GH Actions. For ex: https://github.com/docker/docs/blob/master/.github/workflows/build.yml

@dvdksn
Copy link
Contributor Author

dvdksn commented Oct 19, 2022

I believe we should also update the workflows in GH Actions

I missed the most obvious one!!! 🙈

@crazy-max
Copy link
Member

@dvdksn As discussed I will open a PR to update subject claim in terraform module to deploy to AWS. Also I think we have to update the prod branch on Netlify:

image

Copy link
Member

@crazy-max crazy-max left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, let's wait for subject claim to be changed and branch being renamed before merging.

@usha-mandya
Copy link
Member

@crazy-max @dvdksn Wondering how the branch rename would affect the existing PRs that still point to the 'master' branch?

@crazy-max
Copy link
Member

crazy-max commented Oct 20, 2022

@crazy-max @dvdksn Wondering how the branch rename would affect the existing PRs that still point to the 'master' branch?

Will be changed automatically.

@crazy-max crazy-max merged commit 3afb64d into docker:main Oct 25, 2022
@dvdksn dvdksn deleted the rename-default-branch branch May 3, 2023 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants