Skip to content

Rename master branch to main in non-test repositories#225

Merged
jgraham merged 1 commit into
web-platform-tests:masterfrom
gsnedders:main_branch-side-repos
Jun 3, 2025
Merged

Rename master branch to main in non-test repositories#225
jgraham merged 1 commit into
web-platform-tests:masterfrom
gsnedders:main_branch-side-repos

Conversation

@gsnedders

@gsnedders gsnedders commented May 15, 2025

Copy link
Copy Markdown
Member

Rendered.

This is more limited in scope than #80, because it excludes wpt and wpt-metadata, which is where most of the risk/complexity comes from. This doesn't mean to imply we should not do #80, but we should take the easier wins where we can.

@Ms2ger Ms2ger left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

sgtm

@jgraham jgraham left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Although wpt.live needs approval from whoever owns the deployment of that, since it would probably be broken by this change.

@foolip foolip left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Yay, I look forward to main in all repos I work with :)

@jcscottiii I tried to find where wpt.live is deployed but couldn't. Do you know where it is, and is "master" hardcoded anywhere in that setup?

@jcscottiii jcscottiii left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM from the wpt.live perspective. Deployments for the wpt.live infra are performed manually. As mentioned in the RFC, there are three references to master in the repo. -

  • src/supervisord.conf: Tells the service to update it's local copy of the master branch for wpt. But since wpt's default branch is not updated, no change needed here
  • infrastructure/web-platform-tests/compute.tf: While it is a only a comment, we should point the comment to GCP official docs
  • .github/workflows/lint.yml: We will need to change this from master to main

Looking forward to this change. I can make the above changes once this RFC is merged.

I had a good laugh at the Risk section of the RFC.

@gsnedders

Copy link
Copy Markdown
Member Author

I had a good laugh at the Risk section of the RFC.

Literally a copy/paste of @foolip's #80's risk section. 🙃

I can make the above changes once this RFC is merged.

FWIW, I was planning on doing this, changing src/supervisord.conf to fetch HEAD from upstream wpt (which eliminates one more thing we need to change when wpt finally renames its default branch); and changing .github/workflows/lint.yml to run on both master and main.

@jgraham jgraham merged commit 656acd2 into web-platform-tests:master Jun 3, 2025
@jgraham

jgraham commented Jun 3, 2025

Copy link
Copy Markdown
Contributor

I have now done this for all the listed repos other than wpt.live.

@gsnedders gsnedders deleted the main_branch-side-repos branch June 3, 2025 19:54
@gsnedders

Copy link
Copy Markdown
Member Author

(For those unaware, git remote set-head origin --auto will reset the origin/HEAD symbolic link based on upstream.)

@gsnedders

gsnedders commented Jun 8, 2026

Copy link
Copy Markdown
Member Author

Current status of gh api /orgs/web-platform-tests/repos | jq -r '.[] | select(.default_branch != "main" and (.archived | not)) | .html_url + ": " + .default_branch':

https://github.com/web-platform-tests/wpt: master
https://github.com/web-platform-tests/wpt.live: master
https://github.com/web-platform-tests/wpt-metadata: master

The first and last are #80, and I've filed web-platform-tests/wpt.live#85 for the middle one.

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.

5 participants