Retry composing bundle if it's modified during setup #2890
Merged
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.
Motivation
If someone switches branches while we're setting up the composed bundle and the switch results in gemfile/lockfile changes, we often fail to boot because the resulting bundle is invalid.
Implementation
I think we can reduce the number of failures by checking if the contents of the gemfile or lockfile have been changed after we finished running bundle install. If that's the case, we can re-build the composed bundle from scratch and retry a single time, which should be able to fix common issues.
Automated Tests
Added a test that verifies the new behaviour.