Skip to content

Commit

Permalink
Merge pull request #657 from the-hideout/branch-deploy-sticky-locks
Browse files Browse the repository at this point in the history
Sticky Locks
  • Loading branch information
GrantBirki committed Sep 4, 2023
2 parents 3596dbc + ca30006 commit 9815d86
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

steps:

- uses: github/branch-deploy@v7.3.0
- uses: github/branch-deploy@v7.4.0
id: branch-deploy
with:
admins: the-hideout/core-contributors
Expand All @@ -28,6 +28,7 @@ jobs:
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' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: deployment check
uses: github/branch-deploy@v7.3.0
uses: github/branch-deploy@v7.4.0
id: deployment-check
with:
merge_deploy_mode: "true" # tells the Action to use the merge commit workflow strategy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unlock-on-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: unlock on merge
uses: github/branch-deploy@v7.3.0
uses: github/branch-deploy@v7.4.0
id: unlock-on-merge
with:
unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow
Expand Down

0 comments on commit 9815d86

Please sign in to comment.