diff --git a/.github/workflows/merge-bot-pr.yml b/.github/workflows/merge-bot-pr.yml index f38f398..cd0773c 100644 --- a/.github/workflows/merge-bot-pr.yml +++ b/.github/workflows/merge-bot-pr.yml @@ -30,7 +30,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Wait other jobs - uses: kachick/wait-other-jobs@v2 + uses: kachick/wait-other-jobs@v3 + with: + skip-same-workflow: 'true' timeout-minutes: 10 - name: Approve and merge run: gh pr review --approve "$PR_URL" && gh pr merge --auto --squash "$PR_URL" @@ -45,7 +47,9 @@ jobs: if: ${{ github.actor == 'selfup-runner[bot]' }} steps: - name: Wait other jobs - uses: kachick/wait-other-jobs@v2 + uses: kachick/wait-other-jobs@v3 + with: + skip-same-workflow: 'true' timeout-minutes: 20 - name: Approve and merge run: gh pr review --approve "$PR_URL" && gh pr merge --auto --delete-branch --squash "$PR_URL"