Skip to content

Commit

Permalink
Merge pull request #731 from the-hideout/combined-prs-branch
Browse files Browse the repository at this point in the history
Combined PRs
  • Loading branch information
Shebuka authored Oct 30, 2023
2 parents 649ea4b + 57681b5 commit 29e9e1b
Show file tree
Hide file tree
Showing 5 changed files with 91 additions and 60 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@4b3eae832ab5113c67958be31ca062ad46c593b6 # [email protected].1
uses: cloudflare/wrangler-action@5e8484995321734668f14981c316aa9188d76ed1 # [email protected].2
with:
apiToken: ${{ secrets.CF_API_TOKEN }}
accountId: ${{ secrets.CF_ACCOUNT_ID }}
Expand All @@ -81,7 +81,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@4b3eae832ab5113c67958be31ca062ad46c593b6 # [email protected].1
uses: cloudflare/wrangler-action@5e8484995321734668f14981c316aa9188d76ed1 # [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@4b3eae832ab5113c67958be31ca062ad46c593b6 # [email protected].1
uses: cloudflare/wrangler-action@5e8484995321734668f14981c316aa9188d76ed1 # [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].7
uses: GrantBirki/[email protected].8
continue-on-error: true
with:
file: .github/new-pr-comment.md
135 changes: 83 additions & 52 deletions package-lock.json

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

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@fortawesome/fontawesome-free": "^6.4.2",
"@mdi/js": "^6.9.96",
"@mdi/react": "^1.6.1",
"@mui/lab": "^5.0.0-alpha.149",
"@mui/lab": "^5.0.0-alpha.150",
"@mui/material": "^5.14.14",
"@reduxjs/toolkit": "^1.9.7",
"@testing-library/jest-dom": "^5.17.0",
Expand All @@ -38,7 +38,7 @@
"dayjs": "^1.11.10",
"fast-deep-equal": "^3.1.3",
"framer-motion": "^10.16.0",
"fuse.js": "^6.6.2",
"fuse.js": "^7.0.0",
"i18next": "^23.5.1",
"i18next-browser-languagedetector": "^7.1.0",
"i18next-http-backend": "^2.2.2",
Expand All @@ -47,7 +47,7 @@
"leaflet-fullscreen": "^1.0.2",
"leaflet.awesome-markers": "2.0.5",
"lodash.debounce": "^4.0.8",
"rc-slider": "^10.3.0",
"rc-slider": "^10.3.1",
"react": "^18.2.0",
"react-cookie-consent": "^9.0.0",
"react-countdown": "^2.3.5",
Expand All @@ -68,7 +68,7 @@
"react-switch": "^7.0.0",
"react-syntax-highlighter": "^15.5.0",
"react-table": "^7.8.0",
"react-zoom-pan-pinch": "^3.2.0",
"react-zoom-pan-pinch": "^3.3.0",
"resize-observer-polyfill": "^1.5.1",
"sharp": "^0.32.6",
"source-map-explorer": "^2.5.3",
Expand Down

0 comments on commit 29e9e1b

Please sign in to comment.