Skip to content

Commit

Permalink
Merge pull request #1005 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 21, 2024
2 parents 7e60084 + 985542b commit 13f7427
Show file tree
Hide file tree
Showing 7 changed files with 337 additions and 417 deletions.
8 changes: 4 additions & 4 deletions .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/branch-deploy@v9.8.1
- uses: github/branch-deploy@v9.9.1
id: branch-deploy
with:
admins: the-hideout/core-contributors
Expand All @@ -36,7 +36,7 @@ jobs:
with:
ref: ${{ steps.branch-deploy.outputs.ref }}

- uses: actions/setup-node@v4.0.4
- uses: actions/setup-node@v4.1.0
if: ${{ steps.branch-deploy.outputs.continue == 'true' }}
with:
node-version-file: .node-version
Expand All @@ -58,7 +58,7 @@ jobs:
if: ${{ steps.branch-deploy.outputs.continue == 'true' &&
steps.branch-deploy.outputs.noop != 'true' &&
steps.branch-deploy.outputs.environment == 'development' }}
uses: cloudflare/wrangler-action@f84a562284fc78278ff9052435d9526f9c718361 # pin@v3.7.0
uses: cloudflare/wrangler-action@b2a0191ce60d21388e1a8dcc968b4e9966f938e1 # pin@v3.11.0
with:
apiToken: ${{ secrets.CF_API_TOKEN }}
accountId: ${{ secrets.CF_ACCOUNT_ID }}
Expand All @@ -84,7 +84,7 @@ jobs:
if: ${{ steps.branch-deploy.outputs.continue == 'true' &&
steps.branch-deploy.outputs.noop != 'true' &&
steps.branch-deploy.outputs.environment == 'production' }}
uses: cloudflare/wrangler-action@f84a562284fc78278ff9052435d9526f9c718361 # pin@v3.7.0
uses: cloudflare/wrangler-action@b2a0191ce60d21388e1a8dcc968b4e9966f938e1 # pin@v3.11.0
with:
apiToken: ${{ secrets.CF_API_TOKEN }}
accountId: ${{ secrets.CF_ACCOUNT_ID }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
with:
comment: "true"

- uses: actions/setup-node@v4.0.4
- uses: actions/setup-node@v4.1.0
with:
node-version-file: .node-version
cache: 'npm'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # pin@v2
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # pin@v2
with:
languages: ${{ matrix.language }}

- name: Autobuild
uses: github/codeql-action/autobuild@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # pin@v2
uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # pin@v2

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # pin@v2
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # pin@v2
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.8.1
uses: github/branch-deploy@v9.9.1
id: deployment-check
with:
merge_deploy_mode: "true" # tells the Action to use the merge commit workflow strategy
Expand All @@ -31,7 +31,7 @@ jobs:
if: ${{ steps.deployment-check.outputs.continue == 'true' }}
uses: GrantBirki/json-yaml-validate@v3.2.1

- uses: actions/setup-node@v4.0.4
- uses: actions/setup-node@v4.1.0
if: ${{ steps.deployment-check.outputs.continue == 'true' }}
with:
node-version-file: .node-version
Expand All @@ -53,7 +53,7 @@ jobs:

- name: deploy
if: ${{ steps.deployment-check.outputs.continue == 'true' }}
uses: cloudflare/wrangler-action@f84a562284fc78278ff9052435d9526f9c718361 # pin@v3.7.0
uses: cloudflare/wrangler-action@b2a0191ce60d21388e1a8dcc968b4e9966f938e1 # pin@v3.11.0
with:
apiToken: ${{ secrets.CF_API_TOKEN }}
accountId: ${{ secrets.CF_ACCOUNT_ID }}
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.8.1
uses: github/branch-deploy@v9.9.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 13f7427

Please sign in to comment.