From f2754d278fc7b368decad9d8a61c7aee07691d92 Mon Sep 17 00:00:00 2001 From: Jens L Date: Wed, 6 Sep 2023 12:22:25 +0200 Subject: [PATCH] root: lock node to 20.5 (#6776) * root: lock node to 20.5 there are apparently some breaking issues in 20.6 with babel https://github.com/babel/babel/issues/15927 Signed-off-by: Jens Langhammer * use same version of setup-node everywhere Signed-off-by: Jens Langhammer --------- Signed-off-by: Jens Langhammer # Conflicts: # .github/workflows/ci-web.yml # .github/workflows/ci-website.yml --- .github/actions/setup/action.yml | 2 +- .github/workflows/ci-outpost.yml | 4 ++-- .github/workflows/ci-web.yml | 30 +++++++++++++-------------- .github/workflows/ci-website.yml | 18 ++++++++-------- .github/workflows/release-publish.yml | 4 ++-- .github/workflows/web-api-publish.yml | 4 ++-- Dockerfile | 4 ++-- proxy.Dockerfile | 2 +- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index c13282ba0..9fc956c80 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -23,7 +23,7 @@ runs: - name: Setup node uses: actions/setup-node@v3 with: - node-version: "20" + node-version: "20.5" cache: "npm" cache-dependency-path: web/package-lock.json - name: Setup dependencies diff --git a/.github/workflows/ci-outpost.yml b/.github/workflows/ci-outpost.yml index 84f523f92..6520fd730 100644 --- a/.github/workflows/ci-outpost.yml +++ b/.github/workflows/ci-outpost.yml @@ -120,9 +120,9 @@ jobs: - uses: actions/setup-go@v4 with: go-version-file: "go.mod" - - uses: actions/setup-node@v3.8.1 + - uses: actions/setup-node@v3 with: - node-version: "20" + node-version: "20.5" cache: "npm" cache-dependency-path: web/package-lock.json - name: Generate API diff --git a/.github/workflows/ci-web.yml b/.github/workflows/ci-web.yml index b6da95d2d..6a23127a7 100644 --- a/.github/workflows/ci-web.yml +++ b/.github/workflows/ci-web.yml @@ -14,10 +14,10 @@ jobs: lint-eslint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3.8.1 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 with: - node-version: "20" + node-version: "20.5" cache: "npm" cache-dependency-path: web/package-lock.json - working-directory: web/ @@ -30,10 +30,10 @@ jobs: lint-build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3.8.1 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 with: - node-version: "20" + node-version: "20.5" cache: "npm" cache-dependency-path: web/package-lock.json - working-directory: web/ @@ -46,10 +46,10 @@ jobs: lint-prettier: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3.8.1 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 with: - node-version: "20" + node-version: "20.5" cache: "npm" cache-dependency-path: web/package-lock.json - working-directory: web/ @@ -62,10 +62,10 @@ jobs: lint-lit-analyse: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3.8.1 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 with: - node-version: "20" + node-version: "20.5" cache: "npm" cache-dependency-path: web/package-lock.json - working-directory: web/ @@ -94,10 +94,10 @@ jobs: - ci-web-mark runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3.8.1 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 with: - node-version: "20" + node-version: "20.5" cache: "npm" cache-dependency-path: web/package-lock.json - working-directory: web/ diff --git a/.github/workflows/ci-website.yml b/.github/workflows/ci-website.yml index 38885d83b..0445b4703 100644 --- a/.github/workflows/ci-website.yml +++ b/.github/workflows/ci-website.yml @@ -14,10 +14,10 @@ jobs: lint-prettier: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3.8.1 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 with: - node-version: "20" + node-version: "20.5" cache: "npm" cache-dependency-path: website/package-lock.json - working-directory: website/ @@ -28,10 +28,10 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3.8.1 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 with: - node-version: "20" + node-version: "20.5" cache: "npm" cache-dependency-path: website/package-lock.json - working-directory: website/ @@ -49,10 +49,10 @@ jobs: - build - build-docs-only steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3.8.1 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 with: - node-version: "20" + node-version: "20.5" cache: "npm" cache-dependency-path: website/package-lock.json - working-directory: website/ diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index 032380ee7..b568486db 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -110,9 +110,9 @@ jobs: - uses: actions/setup-go@v4 with: go-version-file: "go.mod" - - uses: actions/setup-node@v3.8.1 + - uses: actions/setup-node@v3 with: - node-version: "20" + node-version: "20.5" cache: "npm" cache-dependency-path: web/package-lock.json - name: Build web diff --git a/.github/workflows/web-api-publish.yml b/.github/workflows/web-api-publish.yml index 1f6ffbb4a..d587b78d9 100644 --- a/.github/workflows/web-api-publish.yml +++ b/.github/workflows/web-api-publish.yml @@ -17,9 +17,9 @@ jobs: - uses: actions/checkout@v3 with: token: ${{ steps.generate_token.outputs.token }} - - uses: actions/setup-node@v3.8.1 + - uses: actions/setup-node@v3 with: - node-version: "20" + node-version: "20.5" registry-url: "https://registry.npmjs.org" - name: Generate API Client run: make gen-client-ts diff --git a/Dockerfile b/Dockerfile index c78b4a96a..cb3f63a13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Stage 1: Build website -FROM --platform=${BUILDPLATFORM} docker.io/node:20 as website-builder +FROM --platform=${BUILDPLATFORM} docker.io/node:20.5 as website-builder COPY ./website /work/website/ COPY ./blueprints /work/blueprints/ @@ -10,7 +10,7 @@ WORKDIR /work/website RUN npm ci --include=dev && npm run build-docs-only # Stage 2: Build webui -FROM --platform=${BUILDPLATFORM} docker.io/node:20 as web-builder +FROM --platform=${BUILDPLATFORM} docker.io/node:20.5 as web-builder COPY ./web /work/web/ COPY ./website /work/website/ diff --git a/proxy.Dockerfile b/proxy.Dockerfile index 3043031f9..0174c32f8 100644 --- a/proxy.Dockerfile +++ b/proxy.Dockerfile @@ -1,5 +1,5 @@ # Stage 1: Build website -FROM --platform=${BUILDPLATFORM} docker.io/node:20 as web-builder +FROM --platform=${BUILDPLATFORM} docker.io/node:20.5 as web-builder COPY ./web /static/