From 0bce072980e5e57211bd0eed1e9c46068cbbf219 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 1 May 2024 16:24:51 +0900 Subject: [PATCH] Update use of actions --- .github/workflows/merge-bot-pr.yml | 16 ++++++++++++++++ .github/workflows/release.yml | 7 +++++++ 2 files changed, 23 insertions(+) diff --git a/.github/workflows/merge-bot-pr.yml b/.github/workflows/merge-bot-pr.yml index 0f643c6..3ab57be 100644 --- a/.github/workflows/merge-bot-pr.yml +++ b/.github/workflows/merge-bot-pr.yml @@ -32,6 +32,14 @@ jobs: steps: - name: Wait other jobs uses: kachick/wait-other-jobs@v3 + with: + skip-same-workflow: 'true' + skip-list: | + [ + { + "workflowFile": "release.yml" + } + ] timeout-minutes: 10 - name: Approve and merge run: gh pr review --approve "$PR_URL" && gh pr merge --auto --squash --delete-branch "$PR_URL" @@ -52,6 +60,14 @@ jobs: steps: - name: Wait other jobs uses: kachick/wait-other-jobs@v3 + with: + skip-same-workflow: 'true' + skip-list: | + [ + { + "workflowFile": "release.yml" + } + ] timeout-minutes: 10 - name: Approve and merge run: gh pr review --approve "$PR_URL" && gh pr merge --auto --squash --delete-branch "$PR_URL" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 307ee24..2eac15b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,6 +13,13 @@ jobs: - uses: actions/checkout@v4 - name: Wait other jobs uses: kachick/wait-other-jobs@v3 + with: + skip-list: | + [ + { + "workflowFile": "merge-bot-pr.yml" + } + ] if: startsWith(github.ref, 'refs/tags/') - name: Release uses: softprops/action-gh-release@v2