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

fix(scripts): ensure release script pulls changes from private/master #730

Merged
merged 2 commits into from Apr 5, 2019

Conversation

@philbooth
Copy link
Member

commented Apr 4, 2019

Now that some private changes landed, I tried the release script again just to make sure it was pulling everything in correctly. And, quel surprise, it wasn't.

This fix ensures we pull from private/master after creating a fresh train-xxx-private branch. It also adds a log line to let the user know what it's doing at that point, in the same way it already does when it creates the public train-xxx branch.

With this change in place, the tree looks sane after tagging a release:

*    (tag: v1.134.1-private, train-134-private) ef4f13c6d Phil Booth Merge train-134 into train-134-private
|\
| *  (tag: v1.134.1, train-134) c57940238 Phil Booth Release fxa-profile-server 1.134.1
| *  7f613ee5d Phil Booth Release fxa-email-service 1.134.1
| *  71b542773 Phil Booth Release fxa-email-event-proxy 1.134.1
| *  e5f3dc4e2 Phil Booth Release fxa-customs-server 1.134.1
| *  ac9e3898b Phil Booth Release fxa-content-server 1.134.1
| *  636d6f838 Phil Booth Release fxa-auth-server 1.134.1
| *  a49160919 Phil Booth Release fxa-auth-db-mysql 1.134.1
* |    (private/master) 0e0a7ad66 Phil Booth Merge pull request #1 from mozilla/fxa-customs-server-private

Without this change applied, you can see that the private branch and tag are identical to their public counterparts:

*  (tag: v1.134.1-private, tag: v1.134.1, train-134-private, train-134) 15ad4b829 Phil Booth Release fxa-profile-server 1.134.1
*  c2f0d3937 Phil Booth Release fxa-email-service 1.134.1
*  ff14ce73d Phil Booth Release fxa-email-event-proxy 1.134.1
*  21b5341ab Phil Booth Release fxa-customs-server 1.134.1
*  2deae682b Phil Booth Release fxa-content-server 1.134.1
*  6789a1cd1 Phil Booth Release fxa-auth-server 1.134.1
*  4618f59d1 Phil Booth Release fxa-auth-db-mysql 1.134.1

@mozilla/fxa-devs r?

@philbooth philbooth self-assigned this Apr 4, 2019

@philbooth philbooth requested a review from mozilla/fxa-devs Apr 4, 2019

@philbooth philbooth added this to the Train 135 milestone Apr 4, 2019

@philbooth philbooth added P0 and removed train-135 labels Apr 4, 2019

@clouserw clouserw added P1 and removed P0 labels Apr 4, 2019

@philbooth philbooth force-pushed the pb/release-script-pull-private-master branch from c6681b5 to a90dd2e Apr 4, 2019

@ghost ghost added the waffle:active label Apr 4, 2019

@clouserw clouserw removed the waffle:active label Apr 4, 2019

@philbooth philbooth force-pushed the pb/release-script-pull-private-master branch from a90dd2e to 9534445 Apr 5, 2019

@ghost ghost added the waffle:active label Apr 5, 2019

@philbooth

This comment has been minimized.

Copy link
Member Author

commented Apr 5, 2019

[there's also a secondary fix pushed here, where the commit summaries weren't being cleared at the end of each iteration of the bump loop]

@philbooth philbooth added status:bug and removed waffle:active labels Apr 5, 2019

@philbooth philbooth force-pushed the pb/release-script-pull-private-master branch from 9534445 to 06c366e Apr 5, 2019

philbooth added some commits Apr 4, 2019

@philbooth philbooth force-pushed the pb/release-script-pull-private-master branch from 06c366e to 8907dd6 Apr 5, 2019

@vbudhram
Copy link
Contributor

left a comment

@philbooth Thanks!

@philbooth philbooth merged commit 89c7e97 into master Apr 5, 2019

2 checks passed

deploy-tag Workflow: deploy-tag
Details
test Workflow: test
Details

@philbooth philbooth deleted the pb/release-script-pull-private-master branch Apr 5, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.