From ca3000667bbd47646b40519bd5010865befe482f Mon Sep 17 00:00:00 2001 From: Grant Birkinbine Date: Sun, 3 Sep 2023 16:56:54 -0600 Subject: [PATCH] use 'sticky_locks: "true"' for the branch-deploy workflow --- .github/workflows/branch-deploy.yml | 3 ++- .github/workflows/deploy.yml | 2 +- .github/workflows/unlock-on-merge.yml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml index 95e9b8cd1..d7555387a 100644 --- a/.github/workflows/branch-deploy.yml +++ b/.github/workflows/branch-deploy.yml @@ -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 @@ -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' }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 28f402b6a..4d1c6be75 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -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 diff --git a/.github/workflows/unlock-on-merge.yml b/.github/workflows/unlock-on-merge.yml index 7a72ee95c..ca4e55bfd 100644 --- 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@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