Merge pull request #1025 from the-hideout/branch-deploy-v10

bump github/branch-deploy to `v10` and update branch-deploy settings
the-hideout · Dec 16, 2024 · 8562b65 · 8562b65
2 parents e5dba3c + 39cd1ad
commit 8562b65
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
@@ -20,20 +20,18 @@ jobs:
 
     steps:
 
-      - uses: github/branch-deploy@v10.0.0-rc.1
+      - uses: github/branch-deploy@v10
         id: branch-deploy
         with:
           admins: the-hideout/core-contributors
           admins_pat: ${{ secrets.BRANCH_DEPLOY_ADMINS_PAT }}
-          skip_ci: development
-          skip_reviews: development
           environment_targets: production,development
           environment_urls: production|https://tarkov.dev,development|disabled
           sticky_locks: "true"
 
       - name: checkout
         if: ${{ steps.branch-deploy.outputs.continue == 'true' }}
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4
         with:
           ref: ${{ steps.branch-deploy.outputs.sha }}
 

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -16,15 +16,17 @@ jobs:
 
     steps:
       - name: deployment check
-        uses: github/branch-deploy@v10.0.0-rc.1
+        uses: github/branch-deploy@v10
         id: deployment-check
         with:
           merge_deploy_mode: "true" # tells the Action to use the merge commit workflow strategy
           environment: production
 
       - name: checkout
         if: ${{ steps.deployment-check.outputs.continue == 'true' }}
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ steps.deployment-check.outputs.sha }}
 
       # check to ensure all JSON files are valid in the repository
       - name: json-yaml-validate

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