Skip to content

Commit

Permalink
Merge pull request #625 from the-hideout/combined-prs-branch
Browse files Browse the repository at this point in the history
Combined PRs
  • Loading branch information
Shebuka authored Aug 16, 2023
2 parents 7829a50 + b0beceb commit 6ad7b97
Show file tree
Hide file tree
Showing 5 changed files with 83 additions and 51 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,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@20ea5060497220b70723b2c5fdf847822eaaa7fa # [email protected].0
uses: cloudflare/wrangler-action@80501a7b4d229a89df2bf50ac1bc99bc0f305ae9 # [email protected].2
with:
apiToken: ${{ secrets.CF_API_TOKEN }}
accountId: ${{ secrets.CF_ACCOUNT_ID }}
Expand All @@ -80,7 +80,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@20ea5060497220b70723b2c5fdf847822eaaa7fa # [email protected].0
uses: cloudflare/wrangler-action@80501a7b4d229a89df2bf50ac1bc99bc0f305ae9 # [email protected].2
with:
apiToken: ${{ secrets.CF_API_TOKEN }}
accountId: ${{ secrets.CF_ACCOUNT_ID }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

- name: deploy
if: ${{ steps.deployment-check.outputs.continue == 'true' }}
uses: cloudflare/wrangler-action@20ea5060497220b70723b2c5fdf847822eaaa7fa # [email protected].0
uses: cloudflare/wrangler-action@80501a7b4d229a89df2bf50ac1bc99bc0f305ae9 # [email protected].2
with:
apiToken: ${{ secrets.CF_API_TOKEN }}
accountId: ${{ secrets.CF_ACCOUNT_ID }}
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 @@ -17,7 +17,7 @@ jobs:
# Comment on new PR requests with deployment instructions
- uses: actions/[email protected]
- name: comment
uses: GrantBirki/[email protected].5
uses: GrantBirki/[email protected].6
continue-on-error: true
with:
file: .github/new-pr-comment.md
120 changes: 76 additions & 44 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@mdi/js": "^6.9.96",
"@mdi/react": "^1.6.1",
"@mui/lab": "^5.0.0-alpha.138",
"@mui/material": "^5.14.3",
"@mui/material": "^5.14.4",
"@reduxjs/toolkit": "^1.9.5",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^14.0.0",
Expand Down Expand Up @@ -55,12 +55,12 @@
"react-error-boundary": "^4.0.10",
"react-helmet": "^6.1.0",
"react-hotkeys-hook": "^4.4.1",
"react-i18next": "^13.0.2",
"react-i18next": "^13.1.2",
"react-intersection-observer": "^9.5.2",
"react-loader-spinner": "^5.3.4",
"react-query": "^3.39.3",
"react-redux": "^8.1.1",
"react-router-dom": "^6.14.2",
"react-router-dom": "^6.15.0",
"react-router-hash-link": "^2.4.3",
"react-scripts": "^5.0.1",
"react-select": "^5.7.4",
Expand Down

0 comments on commit 6ad7b97

Please sign in to comment.