diff --git a/.github/workflows/lockDeploys.yml b/.github/workflows/lockDeploys.yml index 591bfb03ddbe..a7ceb7dc926f 100644 --- a/.github/workflows/lockDeploys.yml +++ b/.github/workflows/lockDeploys.yml @@ -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 @@ -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 }}