Skip to content

Commit 8562b65

Browse files
authored
Merge pull request #1025 from the-hideout/branch-deploy-v10
bump github/branch-deploy to `v10` and update branch-deploy settings
2 parents e5dba3c + 39cd1ad commit 8562b65

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/branch-deploy.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,18 @@ jobs:
2020

2121
steps:
2222

23-
- uses: github/branch-deploy@v10.0.0-rc.1
23+
- uses: github/branch-deploy@v10
2424
id: branch-deploy
2525
with:
2626
admins: the-hideout/core-contributors
2727
admins_pat: ${{ secrets.BRANCH_DEPLOY_ADMINS_PAT }}
28-
skip_ci: development
29-
skip_reviews: development
3028
environment_targets: production,development
3129
environment_urls: production|https://tarkov.dev,development|disabled
3230
sticky_locks: "true"
3331

3432
- name: checkout
3533
if: ${{ steps.branch-deploy.outputs.continue == 'true' }}
36-
uses: actions/checkout@v4.1.1
34+
uses: actions/checkout@v4
3735
with:
3836
ref: ${{ steps.branch-deploy.outputs.sha }}
3937

.github/workflows/deploy.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ jobs:
1616

1717
steps:
1818
- name: deployment check
19-
uses: github/branch-deploy@v10.0.0-rc.1
19+
uses: github/branch-deploy@v10
2020
id: deployment-check
2121
with:
2222
merge_deploy_mode: "true" # tells the Action to use the merge commit workflow strategy
2323
environment: production
2424

2525
- name: checkout
2626
if: ${{ steps.deployment-check.outputs.continue == 'true' }}
27-
uses: actions/[email protected]
27+
uses: actions/checkout@v4
28+
with:
29+
ref: ${{ steps.deployment-check.outputs.sha }}
2830

2931
# check to ensure all JSON files are valid in the repository
3032
- name: json-yaml-validate

.github/workflows/unlock-on-merge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: unlock on merge
17-
uses: github/branch-deploy@v10.0.0-rc.1
17+
uses: github/branch-deploy@v10
1818
id: unlock-on-merge
1919
with:
2020
unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow

0 commit comments

Comments
 (0)