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

Prepare to rename the default branch of amp-github-apps to main #1256

Merged
merged 1 commit into from
Apr 7, 2021
Merged

Prepare to rename the default branch of amp-github-apps to main #1256

merged 1 commit into from
Apr 7, 2021

Conversation

rsimha
Copy link
Contributor

@rsimha rsimha commented Mar 30, 2021

PR Highlights:

  • Sets the stage to change the default branch of amp-github-apps to main
  • The only instances of master that will remain in this repo are links to meta, amphtml-build-artifacts, amphtml, and error-tracker. They'll need to be updated separately.

Note: Looks like prettier auto-formatting kicked in for the .md files I updated. I'm going to leave those changes in.

Next steps: Soon after this PR is merged, we can rename the default branch to main. After review, I'll coordinate this action manually. This will serve as a practice run for the more involved switch for amphtml 😃

image

Partial fix for ampproject/amphtml#32195
Accompanying PR to ampproject/amphtml#33571

Copy link
Contributor

@rcebulko rcebulko left a comment

Choose a reason for hiding this comment

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

Right now, there is no main branch for this repo, so workflows could fail and links will be dead in the interim. Have we considered creating a main branch and keeping them automatically sync'd (this could be as easy as a cloud function running every minute that makes main point to HEAD of master)? This would be a lightweight solution, easily applicable here and to all the other repos, that would give plenty of time for all the pieces to migrate safely

Edit: This would also provide a wider window for developers to adapt their workflows/IDE/git settings to the new branch.

@rsimha
Copy link
Contributor Author

rsimha commented Mar 30, 2021

Right now, there is no main branch for this repo, so workflows could fail and links will be dead in the interim.

According to the GitHub documentation, links will auto-redirect, draft PRs will be auto-transitioned, etc.

Have we considered creating a main branch and keeping them automatically sync'd (this could be as easy as a cloud function running every minute that makes main point to HEAD of master)? This would be a lightweight solution, easily applicable here and to all the other repos, that would give plenty of time for all the pieces to migrate safely

This is an ongoing topic of discussion. I've written up a doc with a high-level plan and listed this as an alternative. Based on current evidence and GitHub's built-in features, I think renaming the branch is preferable to creating a duplicate and syncing commits, but I am open to looking at more evidence in favor of / against this plan. Let's continue the discussion via doc comments before taking any further action on this PR.

@rsimha
Copy link
Contributor Author

rsimha commented Apr 6, 2021

Bumping this PR now that a transition plan has been published.

Once this PR is reviewed and merged, I will rename the branch, immediately merge this PR, and make sure that all post-merge CI ran fine against the correct branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants