-
Notifications
You must be signed in to change notification settings - Fork 3.9k
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
Make build-system
code main-branch-agnostic
#33535
Conversation
Hey @danielrozenberg! These files were changed:
|
This seems like overkill for me... Are we expecting this value to change more than once? Introducing another dependency (even if it's a single string) makes the code slightly more difficult to read in places where there's no real reason to once the switch is made... |
This is being done in order to make the migration safe and gradual. After this PR lands, we'll need to rename the branch on GitHub and then immediately change this file and force-merge the change. Trying to coordinate all changes is inherently risky and can break CI / development if even one merge conflict creeps in. Long-term, I agree that |
I agree with @danielrozenberg. I think a find&replace should be fine, as long as we have the release automation changes ready to go too. I found this useful https://www.hanselman.com/blog/easily-rename-your-git-default-branch-from-master-to-main |
To clarify, Is the main (heh!) objection the addition of Trying to coordinate this change with other changes across Let's discuss further during tomorrow's Infra stand-up. There might be other ideas that haven't been considered.
Agree, this is useful. However, it looks that the |
As discussed offline, the goal is to use |
@ampproject/wg-infra Any remaining comments to address? Okay to merge this part? |
PR Highlights:
master
in thebuild-system/
implementationcommon/main-branch.js
(will be changed tomain
later)Notes:
Partial fix for #32195