From 08ce49bf5fb4199205da4ac04b564ea4c4216857 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 02:12:52 +0000 Subject: [PATCH 1/2] Bump kachick/wait-other-jobs from 2 to 3 Bumps [kachick/wait-other-jobs](https://github.com/kachick/wait-other-jobs) from 2 to 3. - [Release notes](https://github.com/kachick/wait-other-jobs/releases) - [Changelog](https://github.com/kachick/wait-other-jobs/blob/main/CHANGELOG.md) - [Commits](https://github.com/kachick/wait-other-jobs/compare/v2...v3) --- updated-dependencies: - dependency-name: kachick/wait-other-jobs dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/merge-bot-pr.yml | 4 ++-- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/merge-bot-pr.yml b/.github/workflows/merge-bot-pr.yml index 0e2ae18..e52cc32 100644 --- a/.github/workflows/merge-bot-pr.yml +++ b/.github/workflows/merge-bot-pr.yml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Wait other jobs - uses: kachick/wait-other-jobs@v2 + uses: kachick/wait-other-jobs@v3 timeout-minutes: 30 with: retry-method: 'equal_intervals' @@ -54,7 +54,7 @@ jobs: if: ${{ github.actor == 'renovate[bot]' }} steps: - name: Wait other jobs - uses: kachick/wait-other-jobs@v2 + uses: kachick/wait-other-jobs@v3 timeout-minutes: 30 with: retry-method: 'equal_intervals' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 794d825..307ee24 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Wait other jobs - uses: kachick/wait-other-jobs@v2 + uses: kachick/wait-other-jobs@v3 if: startsWith(github.ref, 'refs/tags/') - name: Release uses: softprops/action-gh-release@v2 From 1d55905c9e8dc8dbef5e3beb31d96be17da07e4e Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 19 Apr 2024 03:59:57 +0900 Subject: [PATCH 2/2] Update options for wait-other-jobs --- .github/workflows/merge-bot-pr.yml | 14 ++++++++++++++ .github/workflows/release.yml | 8 ++++++++ 2 files changed, 22 insertions(+) diff --git a/.github/workflows/merge-bot-pr.yml b/.github/workflows/merge-bot-pr.yml index e52cc32..f01ce8a 100644 --- a/.github/workflows/merge-bot-pr.yml +++ b/.github/workflows/merge-bot-pr.yml @@ -36,6 +36,13 @@ jobs: with: retry-method: 'equal_intervals' min-interval-seconds: '15' + skip-same-workflow: 'true' + skip-list: | + [ + { + "workflowFile": "release.yml" + } + ] - name: Approve and merge run: gh pr review --approve "$PR_URL" && gh pr merge --auto --squash --delete-branch "$PR_URL" env: @@ -59,6 +66,13 @@ jobs: with: retry-method: 'equal_intervals' min-interval-seconds: '15' + skip-same-workflow: 'true' + skip-list: | + [ + { + "workflowFile": "release.yml" + } + ] - name: Approve and merge run: gh pr review --approve "$PR_URL" && gh pr merge --auto --squash --delete-branch "$PR_URL" env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 307ee24..d134a45 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,6 +13,14 @@ jobs: - uses: actions/checkout@v4 - name: Wait other jobs uses: kachick/wait-other-jobs@v3 + with: + retry-method: 'equal_intervals' + skip-list: | + [ + { + "workflowFile": "merge-bot-pr.yml" + } + ] if: startsWith(github.ref, 'refs/tags/') - name: Release uses: softprops/action-gh-release@v2