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): stop release script failing in diff size logic #920

Merged
merged 1 commit into from Apr 24, 2019

Conversation

@philbooth
Copy link
Member

commented Apr 24, 2019

Testing my changes for #857, I realised I'd previously broken the release script with my changes for #856.

I tested that logic in the PRIVATE_DIFF_SIZE <= 300 case, but evidently failed to do so in the > 300 case.

There were two problems with it:

  • It used the return code rather than the result string from the expr command. This meant the positive branch of the test was never entered.

  • It didn't trim whitespace from the wc -l result.

This PR fixes both of those issues.

@mozilla/fxa-devs r?

fix(scripts): stop release script failing in diff size logic
There were two problems with the logic to conditionally warn about the
size of the diff in the private repo PR, introduced in 11f41bf:

* It used the return code rather than the result string from the `expr`
  command. This meant the positive branch of the test was never entered.

* It didn't trim whitespace from the `wc -l` result.

This change fixes both problems.

@ghost ghost assigned philbooth Apr 24, 2019

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

@philbooth philbooth added this to the Train 136 milestone Apr 24, 2019

@shane-tomlinson
Copy link
Member

left a comment

r+

@philbooth philbooth merged commit 697dac8 into master Apr 24, 2019

1 check passed

test Workflow: test
Details

@philbooth philbooth deleted the pb/fix-release-script branch Apr 24, 2019

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