Skip to content

Fix race condition with automerge and lockDeploys workflow #1945

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.

Sign up for GitHub

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

Merged
roryabraham merged 1 commit into from
Mar 19, 2021
Merged

Fix race condition with automerge and lockDeploys workflow #1945

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/lockDeploys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,20 @@ jobs:

- name: Wait for any preDeploy version jobs to finish
uses: tomchv/wait-my-workflow@2da0b8a92211e6d7c9964602b99a7052080a1d61
id: waitForPreDeploy
with:
token: ${{ secrets.GITHUB_TOKEN }}
checkName: version
intervalSeconds: 10
timeoutSeconds: 360

- name: Wait for any automerge-master jobs to finish
uses: tomchv/wait-my-workflow@2da0b8a92211e6d7c9964602b99a7052080a1d61
with:
token: ${{ secrets.GITHUB_TOKEN }}
checkName: master
intervalSeconds: 10
timeoutSeconds: 150

- uses: softprops/turnstyle@8db075d65b19bf94e6e8687b504db69938dc3c65
with:
poll-interval-seconds: 10
Expand All @@ -34,6 +41,7 @@ jobs:
- name: Create a new branch
run: |
git config user.name OSBotify
git pull origin master
git checkout -b version-patch-${{ github.sha }}
git push --set-upstream origin version-patch-${{ github.sha }}

Expand Down