Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/npm-dependencies-e83…
Browse files Browse the repository at this point in the history
…b2c8bfb
  • Loading branch information
Razzmatazzz authored Aug 1, 2024
2 parents cf9da41 + 1a01591 commit 4ff72f6
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .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/branch-deploy@v9.3.0
- uses: github/branch-deploy@v9.4.0
id: branch-deploy
with:
admins: the-hideout/core-contributors
Expand Down Expand Up @@ -48,14 +48,14 @@ jobs:
if: ${{ steps.branch-deploy.outputs.environment == 'development' &&
steps.branch-deploy.outputs.noop != 'true' &&
steps.branch-deploy.outputs.continue == 'true' }}
uses: cloudflare/wrangler-action@a08dc762e87e8754e0d56a16a35a70b406bc869f # pin@3.6.1
uses: cloudflare/wrangler-action@f84a562284fc78278ff9052435d9526f9c718361 # pin@3.7.0
with:
wranglerVersion: '2.17.0'
apiToken: ${{ secrets.CF_API_TOKEN }}
environment: "development"

# Post comment on PR with development deploy info
- uses: GrantBirki/comment@v2.0.10
- uses: GrantBirki/comment@v2.1.0
if: ${{ steps.branch-deploy.outputs.continue == 'true' &&
steps.branch-deploy.outputs.noop != 'true' &&
steps.branch-deploy.outputs.environment == 'development' }}
Expand All @@ -75,13 +75,13 @@ jobs:
if: ${{ steps.branch-deploy.outputs.continue == 'true' &&
steps.branch-deploy.outputs.noop != 'true' &&
steps.branch-deploy.outputs.environment == 'production' }}
uses: cloudflare/wrangler-action@a08dc762e87e8754e0d56a16a35a70b406bc869f # pin@3.6.1
uses: cloudflare/wrangler-action@f84a562284fc78278ff9052435d9526f9c718361 # pin@3.7.0
with:
wranglerVersion: '2.17.0'
apiToken: ${{ secrets.CF_API_TOKEN }}

# Post comment on PR with production deploy info
- uses: GrantBirki/comment@v2.0.10
- uses: GrantBirki/comment@v2.1.0
if: ${{ steps.branch-deploy.outputs.continue == 'true' &&
steps.branch-deploy.outputs.noop != 'true' &&
steps.branch-deploy.outputs.environment == 'production' }}
Expand Down
4 changes: 2 additions & 2 deletions .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/branch-deploy@v9.3.0
uses: github/branch-deploy@v9.4.0
id: deployment-check
with:
merge_deploy_mode: "true"
Expand All @@ -43,7 +43,7 @@ jobs:
run: npm ci

- name: Publish - Production
uses: cloudflare/wrangler-action@a08dc762e87e8754e0d56a16a35a70b406bc869f # pin@3.6.1
uses: cloudflare/wrangler-action@f84a562284fc78278ff9052435d9526f9c718361 # pin@3.7.0
with:
wranglerVersion: '2.17.0'
apiToken: ${{ secrets.CF_API_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/new-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v4

- name: comment
uses: GrantBirki/comment@v2.0.10
uses: GrantBirki/comment@v2.1.0
continue-on-error: true
with:
file: .github/new-pr-comment.md
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/branch-deploy@v9.3.0
uses: github/branch-deploy@v9.4.0
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 4ff72f6

Please sign in to comment.