Fix automerge race condition again #1952
Merged
Conversation
This file contains 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
roryabraham
changed the title
|
Is this a temporary or long term solution? |
|
I think this is a long term solution. If another PR is merged while we're sleeping in this workflow, then the |
|
Alright, let's give it a shot! |
AndrewGable
approved these changes
Mar 19, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Details
Following up on #1945
That didn't quite work because by the time we went to check for an ongoing automerge PR, the automerge workflow run had not yet started. To solve that, just wait for a minute before checking for ongoing automerge PRs.
Fixed Issues
Fixes https://github.com/Expensify/Expensify/issues/155210
Tests
Retest #1938