Skip to content

Commit

Permalink
fix: merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
PatrickHeneise committed Nov 16, 2023
2 parents bc5cb70 + 9edc014 commit 0bc5323
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 47 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codequality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
codequality:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.4
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2.4.0
with:
version: '${{ inputs.pnpm-version }}'
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}
cache: 'pnpm'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
env:
CI: true
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.4
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2.4.0
with:
version: ${{ inputs.pnpm-version }}
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}
cache: 'pnpm'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gitevents-invite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: lts/hydrogen
- name: gitevents
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
needs: [codequality, unit]
if: needs.codequality.result == 'success' && needs.unit.result == 'success'
steps:
- uses: styfle/cancel-workflow-action@0.11.0
- uses: actions/checkout@v3
- uses: superfly/flyctl-actions@1.3
- uses: styfle/cancel-workflow-action@0.12.0
- uses: actions/checkout@v4
- uses: superfly/flyctl-actions@1.4
with:
args:
'deploy --app cdc-cy --remote-only --build-arg COMMIT_SHA=${{
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
unit:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '${{ inputs.node-version }}'
- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v2.4.0
with:
version: '${{ inputs.pnpm-version }}'

Expand Down
67 changes: 35 additions & 32 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"tailwindcss": "^3.3.5",
"vite": "^4.5.0",
"vite-plugin-solid": "^2.7.2",
"wrangler": "^3.15.0"
"wrangler": "^3.16.0"
},
"engines": {
"node": ">=18"
Expand Down

0 comments on commit 0bc5323

Please sign in to comment.