Skip to content

Commit

Permalink
Merge pull request #1952 from Expensify/Rory-FixRaceConditionAgain
Browse files Browse the repository at this point in the history
Fix automerge race condition again
  • Loading branch information
AndrewGable authored Mar 19, 2021
2 parents 175b527 + 4d29936 commit 30ea57d
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/lockDeploys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ jobs:
intervalSeconds: 10
timeoutSeconds: 360

- name: Wait for any automerge jobs to start
run: sleep 60

- name: Wait for any automerge-master jobs to finish
uses: tomchv/wait-my-workflow@2da0b8a92211e6d7c9964602b99a7052080a1d61
with:
Expand Down

0 comments on commit 30ea57d

Please sign in to comment.