Skip to content

Commit

Permalink
Merge pull request #317 from the-hideout/combined-prs-branch
Browse files Browse the repository at this point in the history
Combined PRs
  • Loading branch information
Razzmatazzz authored Oct 4, 2024
2 parents 58e0ace + 3681b97 commit e55f30e
Show file tree
Hide file tree
Showing 9 changed files with 110 additions and 118 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
- name: branch-deploy
id: branch-deploy
uses: github/branch-deploy@v9.7.0
uses: github/branch-deploy@v9.8.1
with:
admins: the-hideout/core-contributors
admins_pat: ${{ secrets.BRANCH_DEPLOY_ADMINS_PAT }}
Expand All @@ -30,11 +30,11 @@ jobs:

- name: checkout
if: steps.branch-deploy.outputs.continue == 'true'
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
ref: ${{ steps.branch-deploy.outputs.ref }}

- uses: actions/[email protected].3
- uses: actions/[email protected].4
if: steps.branch-deploy.outputs.continue == 'true'
with:
node-version-file: .node-version
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

steps:
- name: checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

# validate JSON and YAML files
- name: json-yaml-validate
Expand All @@ -26,7 +26,7 @@ jobs:
comment: "true"
exclude_file: ".github/config/exclude.txt"

- uses: actions/[email protected].3
- uses: actions/[email protected].4
with:
node-version-file: .node-version
cache: 'npm'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
6 changes: 3 additions & 3 deletions .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@v9.7.0
uses: github/branch-deploy@v9.8.1
id: deployment-check
with:
merge_deploy_mode: "true" # tells the Action to use the merge commit workflow strategy
Expand All @@ -25,9 +25,9 @@ jobs:
# always run checkout because the 'release (sentry)' step needs the code
# do we still need this after removing sentry?
- name: checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- uses: actions/[email protected].3
- uses: actions/[email protected].4
if: ${{ steps.deployment-check.outputs.continue == 'true' }}
with:
node-version-file: .node-version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/new-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
# Comment on new PR requests with deployment instructions
- name: checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
- name: comment
uses: GrantBirki/comment@f524ee31407667c05061bad41e1758b40298bd82 # [email protected]
continue-on-error: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/restart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:

steps:
- name: checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- uses: actions/[email protected].3
- uses: actions/[email protected].4
with:
node-version-file: .node-version
cache: 'npm'
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.7.0
uses: github/branch-deploy@v9.8.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 e55f30e

Please sign in to comment.