Skip to content

Commit

Permalink
Merge pull request #297 from the-hideout/combined-prs-branch
Browse files Browse the repository at this point in the history
Combined PRs
  • Loading branch information
Razzmatazzz authored May 13, 2024
2 parents 3d2b46e + 9c21c37 commit 1aec12b
Show file tree
Hide file tree
Showing 5 changed files with 99 additions and 96 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: github/[email protected].2
- uses: github/[email protected].3
id: branch-deploy
with:
admins: the-hideout/core-contributors
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
# https://github.com/github/branch-deploy/blob/d3c24bd92505e623615b75ffdfac5ed5259adbdb/docs/merge-commit-strategy.md
- name: deployment check
uses: github/[email protected].2
uses: github/[email protected].3
id: deployment-check
with:
merge_deploy_mode: "true"
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 @@ -16,7 +16,7 @@ jobs:

steps:
- name: unlock on merge
uses: github/[email protected].2
uses: github/[email protected].3
id: unlock-on-merge
with:
unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow
Expand Down
Loading

0 comments on commit 1aec12b

Please sign in to comment.