Skip to content

Commit

Permalink
Merge pull request #95 from the-hideout/branch-deploy-v10
Browse files Browse the repository at this point in the history
bump github/branch-deploy to `v10`
  • Loading branch information
GrantBirki authored Dec 16, 2024
2 parents 3f3aded + be3c043 commit ae7ba75
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
steps:
- name: branch-deploy
id: branch-deploy
uses: github/branch-deploy@v9
uses: github/branch-deploy@v10
with:
admins: the-hideout/core-contributors
admins_pat: ${{ secrets.BRANCH_DEPLOY_ADMINS_PAT }}
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ jobs:
runs-on: ubuntu-latest
outputs: # set outputs for use in downstream jobs
continue: ${{ steps.deployment-check.outputs.continue }}
sha: ${{ steps.deployment-check.outputs.sha }}

steps:
# https://github.com/github/branch-deploy/blob/d3c24bd92505e623615b75ffdfac5ed5259adbdb/docs/merge-commit-strategy.md
- name: deployment check
uses: github/branch-deploy@v9
uses: github/branch-deploy@v10
id: deployment-check
with:
merge_deploy_mode: "true"
Expand All @@ -38,6 +39,8 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v4
with:
ref: ${{ needs.deployment-check.outputs.sha }}

- uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # [email protected]
with:
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@v9
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
Expand Down

0 comments on commit ae7ba75

Please sign in to comment.