From 85db525267d1396dc65ecdfa34626c2f55e9af47 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 May 2024 16:29:30 +0900
Subject: [PATCH] Bump kachick/wait-other-jobs from 2 to 3 (#502)

* 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] <support@github.com>

* Update use of actions

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Kenichi Kamiya <kachick1@gmail.com>
---
 .github/workflows/firebase-hosting-merge.yml | 10 ++++++-
 .github/workflows/merge-bot-pr.yml           | 30 ++++++++++++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
index d109946..bbcbc0c 100644
--- a/.github/workflows/firebase-hosting-merge.yml
+++ b/.github/workflows/firebase-hosting-merge.yml
@@ -34,7 +34,15 @@ jobs:
       - name: Build
         run: npm run build
       - name: Wait other jobs
-        uses: kachick/wait-other-jobs@v2
+        uses: kachick/wait-other-jobs@v3
+        with:
+          skip-same-workflow: 'true'
+          skip-list: |
+            [
+              {
+                "workflowFile": "merge-bot-pr.yml"
+              }
+            ]
         timeout-minutes: 15
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
diff --git a/.github/workflows/merge-bot-pr.yml b/.github/workflows/merge-bot-pr.yml
index fd19cc9..95462ca 100644
--- a/.github/workflows/merge-bot-pr.yml
+++ b/.github/workflows/merge-bot-pr.yml
@@ -18,7 +18,15 @@ jobs:
         uses: dependabot/fetch-metadata@v2.1.0
       - name: Wait other jobs
         if: ${{ steps.metadata.outputs.update-type != 'version-update:semver-major' }}
-        uses: kachick/wait-other-jobs@v2
+        uses: kachick/wait-other-jobs@v3
+        with:
+          skip-same-workflow: 'true'
+          skip-list: |
+            [
+              {
+                "workflowFile": "firebase-hosting-merge.yml"
+              }
+            ]
         timeout-minutes: 10
       - name: Approve and merge
         if: ${{ steps.metadata.outputs.update-type != 'version-update:semver-major' || contains(steps.metadata.outputs.dependency-names, 'DeterminateSystems') }}
@@ -40,7 +48,15 @@ jobs:
     if: ${{ github.actor == 'renovate[bot]' }}
     steps:
       - name: Wait other jobs
-        uses: kachick/wait-other-jobs@v2
+        uses: kachick/wait-other-jobs@v3
+        with:
+          skip-same-workflow: 'true'
+          skip-list: |
+            [
+              {
+                "workflowFile": "firebase-hosting-merge.yml"
+              }
+            ]
         timeout-minutes: 10
       - name: Approve and merge
         run: gh pr review --approve "$PR_URL" && gh pr merge --auto --squash "$PR_URL"
@@ -54,7 +70,15 @@ jobs:
     if: ${{ github.actor == 'mobu-update-dependencies[bot]' }}
     steps:
       - name: Wait other jobs
-        uses: kachick/wait-other-jobs@v2
+        uses: kachick/wait-other-jobs@v3
+        with:
+          skip-same-workflow: 'true'
+          skip-list: |
+            [
+              {
+                "workflowFile": "firebase-hosting-merge.yml"
+              }
+            ]
         timeout-minutes: 20
       - name: Approve and merge
         run: gh pr review --approve "$PR_URL" && gh pr merge --auto --delete-branch --squash "$PR_URL"