Unbreak master #1077
Merged
Unbreak master #1077
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Because we didn't have a `Gemfile`, `rbenv exec srb` just runs whichever version of `srb` is installed for the current Ruby version in `.ruby-version`. In particular, because the `~/.rbenv` folder is shared across tests, it might have artifacts from other people's branches (specifically when the tests failed, and we didn't get to the line to delete the existing gems). And because our version numbers are just "how many commits since the beginning of time", 0.4.FOO might be the same number as 0.4.BAR in someone else's branch, even though those two versions are completely unrelated, and **also** completely unrelated to the gems that will EVENTUALLY be published with that as the Canonical Version. I chose to both remove before each run and al 8000 so trap EXIT just in case, because in no cases do we want these gems to persist on the mac machine after a CI run.
DarkDimius
approved these changes
Jun 26, 2019
ptarjan
reviewed
Jun 26, 2019
| @@ -47,6 +47,8 @@ pushd gems/sorbet | |||
| sed -i.bak "s/0\\.0\\.0/${release_version}/" sorbet.gemspec | |||
| gem build sorbet.gemspec | |||
| if [[ "mac" == "$platform" ]]; then | |||
| rbenv exec gem uninstall --all --executables --ignore-dependencies sorbet sorbet-static | |||
| trap 'rbenv exec gem uninstall --all --executables --ignore-dependencies sorbet sorbet-static' EXIT | |||
There was a problem hiding this comment.
why is the rbenv .... everything .... duplicated?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Because we didn't have a
Gemfile,rbenv exec srbjust runs whicheverversion of
srbis installed for the current Ruby version in.ruby-version.In particular, because the
~/.rbenvfolder is shared across tests, itmight have artifacts from other people's branches (specifically when the
tests failed, and we didn't get to the line to delete the existing
gems). And because our version numbers are just "how many commits since
the beginning of time", 0.4.FOO might be the same number as 0.4.BAR in
someone else's branch, even though those two versions are completely
unrelated, and also completely unrelated to the gems that will
EVENTUALLY be published with that as the Canonical Version.
I chose to both remove before each run and also trap EXIT just in case,
because in no cases do we want these gems to persist on the mac machine
after a CI run.
Motivation
Unbreak master.
Test plan
CI should pass now.