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

Change all references to master branch to trunk #45234

Merged
merged 2 commits into from Nov 20, 2020

Conversation

sarayourfriend
Copy link
Contributor

@sarayourfriend sarayourfriend commented Aug 26, 2020

Changes proposed in this Pull Request

  • Change references to the old master branch to be to the new trunk.

Testing instructions

  • Ensure translation jobs and e2e tests are working.

Related to #43395 and #45230

Do not merge until after we rename the branch

@matticbot
Copy link
Contributor

@sarayourfriend sarayourfriend requested a review from a team August 26, 2020 19:21
@matticbot matticbot added the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label Aug 26, 2020
@matticbot
Copy link
Contributor

This PR does not affect the size of JS and CSS bundles shipped to the user's browser.

Generated by performance advisor bot at iscalypsofastyet.com.

@@ -11,8 +11,8 @@ console.log(

const currentBranch = execSync( 'git rev-parse --abbrev-ref HEAD' ).toString().trim();

if ( 'master' === currentBranch ) {
if ( ! readline.keyInYN( "You're about to push !!![ master ]!!!, is that what you intended?" ) ) {
if ( 'trunk' === currentBranch ) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Do you think we need to support trunk and master for a period of time while we wait for everybody to rename their local branches?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, that's a good idea. That should also be helped by the calypso-doctor check I'm going to add as well.

Copy link
Member

@tyxla tyxla left a comment

Choose a reason for hiding this comment

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

There's an occurrence of origin/master in .github/workflows/icfy-stats.yml - perhaps we should replace that too?

@sirreal sirreal added [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. and removed [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels Aug 27, 2020
@sarayourfriend sarayourfriend changed the title Change all references to master branch to trunk [DO NOT MERGE] Change all references to master branch to trunk Aug 27, 2020
@scinos scinos force-pushed the cleanup/change-references-to-master-branch-to-trunk branch from 94507e6 to 667418c Compare November 20, 2020 14:09
@sarayourfriend sarayourfriend changed the base branch from master to trunk November 20, 2020 16:06
@sarayourfriend sarayourfriend changed the title [DO NOT MERGE] Change all references to master branch to trunk Change all references to master branch to trunk Nov 20, 2020
@scinos scinos merged commit 61acc95 into trunk Nov 20, 2020
@scinos scinos deleted the cleanup/change-references-to-master-branch-to-trunk branch November 20, 2020 16:12
@matticbot matticbot removed the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label Nov 20, 2020
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

5 participants