Skip to content

Commit

Permalink
Merge pull request #732 from the-hideout/combined-prs-branch
Browse files Browse the repository at this point in the history
Combined PRs
  • Loading branch information
Razzmatazzz authored Nov 9, 2023
2 parents 34db5fc + a51e19b commit 9fd3399
Show file tree
Hide file tree
Showing 5 changed files with 222 additions and 261 deletions.
2 changes: 1 addition & 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/[email protected].0
- uses: github/[email protected].1
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 @@ -16,7 +16,7 @@ jobs:

steps:
- name: deployment check
uses: github/[email protected].0
uses: github/[email protected].1
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/[email protected].0
uses: github/[email protected].1
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 9fd3399

Please sign in to comment.