Merge pull request #311 from the-hideout/combined-prs-branch

Combined PRs
the-hideout · Jul 4, 2024 · 6484405 · 6484405
2 parents 9b22f78 + ee578eb
commit 6484405
Show file tree

Hide file tree

Showing 5 changed files with 102 additions and 84 deletions.
diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: github/branch-deploy@v9.1.3
+      - uses: github/branch-deploy@v9.3.0
         id: branch-deploy
         with:
           admins: the-hideout/core-contributors

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       # https://github.com/github/branch-deploy/blob/d3c24bd92505e623615b75ffdfac5ed5259adbdb/docs/merge-commit-strategy.md
       - name: deployment check
-        uses: github/branch-deploy@v9.1.3
+        uses: github/branch-deploy@v9.3.0
         id: deployment-check
         with:
           merge_deploy_mode: "true"

diff --git a/.github/workflows/unlock-on-merge.yml b/.github/workflows/unlock-on-merge.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: unlock on merge
-        uses: github/branch-deploy@v9.1.3
+        uses: github/branch-deploy@v9.3.0
         id: unlock-on-merge
         with:
           unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow

diff --git a/package-lock.json b/package-lock.json