Skip to content

Commit

Permalink
Merge branch 'ke/update-node' of https://github.com/kitspace/kitspace-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
Kitspace Auto-Merge Bot committed Apr 21, 2024
2 parents f5061d4 + b278fdb commit 52a440a
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
if: ${{ github.event_name == 'push' || !github.event.pull_request.draft || github.event.action == 'converted_to_draft' }}
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: master
# bit confused about what credentials it normally persists and why
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/copy-import-script.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- run: mkdir target

- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Compile the script
run: deno compile --allow-env --allow-net --allow-run --target x86_64-unknown-linux-gnu --output target/importBoardsTxt scripts/importBoardsTxt.ts --githubToken ${{ secrets.IMPORT_SCRIPT_ACCESS_TOKEN }}

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
matrix: ${{ steps.set_matrix.outputs.matrix }}
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# check out the pull-request when triggered by "pull_request_target",
# when triggered on "push" this is empty and checks out the branch
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
echo "image_exists=${image_exists}" >> $GITHUB_OUTPUT
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4
if: steps.check_for_image.outputs.image_exists == 'false'
with:
# check out the pull-request when triggered by "pull_request_target",
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
- build
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: 'recursive'
# 0 means fetch all commits, which we need for "review" branch deploy
Expand Down Expand Up @@ -256,7 +256,7 @@ jobs:
steps:
- name: Check out the repo
# https://github.com/getsentry/action-release#troubleshooting
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: 'recursive'
fetch-depth: 0
Expand All @@ -280,13 +280,13 @@ jobs:
fail-fast: false
matrix: ${{ fromJson(needs.get_version.outputs.matrix) }}
steps:
- name: Setup Node 16
uses: actions/setup-node@v3
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '16'
node-version: '20'

- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# check out the pull-request when triggered by "pull_request_target",
# when triggered on "push" this is empty and checks out the branch
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '16'
node-version: '20'

- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: 'yarn install'
- run: 'yarn tsc'
- run: 'yarn lint --max-warnings 0'
8 changes: 4 additions & 4 deletions .github/workflows/lint-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
lint_processor:
runs-on: ubuntu-20.04
steps:
- name: Setup Node 16
uses: actions/setup-node@v3
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '16'
- uses: actions/checkout@v3
node-version: '20'
- uses: actions/checkout@v4
- run: 'yarn install'
- run: 'yarn lint --max-warnings 0'
- run: 'yarn tsc'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
test_frontend:
runs-on: ubuntu-20.04
steps:
- name: Setup Node 16
uses: actions/setup-node@v3
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '16'
- uses: actions/checkout@v3
node-version: '20'
- uses: actions/checkout@v4
- run: 'yarn install'
- run: 'yarn vitest --run'
2 changes: 1 addition & 1 deletion .github/workflows/test-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
test_processor:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: 'recursive'
- run: cp .env.example .env
Expand Down
2 changes: 1 addition & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-alpine AS base
FROM node:20-alpine AS base
WORKDIR /app

FROM base AS git-installed
Expand Down

0 comments on commit 52a440a

Please sign in to comment.