From 5d491d697a60f549a67c3bfc74d88110cc64a844 Mon Sep 17 00:00:00 2001 From: Derk-Jan Karrenbeld Date: Thu, 2 Jan 2025 19:51:43 +0100 Subject: [PATCH 1/3] Update Node LTS --- .github/workflows/action-format.yml | 4 ++-- .github/workflows/ci.js.yml | 6 +++--- .github/workflows/pr.ci.js.yml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/action-format.yml b/.github/workflows/action-format.yml index a4d279086e..a86c8dfa47 100644 --- a/.github/workflows/action-format.yml +++ b/.github/workflows/action-format.yml @@ -63,10 +63,10 @@ jobs: - name: Enable corepack to fix https://github.com/actions/setup-node/pull/901 run: corepack enable pnpm - - name: Use Node.js LTS (20.x) + - name: Use Node.js LTS (22.x) uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b with: - node-version: 20.x + node-version: 22.x cache: 'pnpm' - name: Install project development dependencies diff --git a/.github/workflows/ci.js.yml b/.github/workflows/ci.js.yml index 5dc5559e43..194f7c845b 100644 --- a/.github/workflows/ci.js.yml +++ b/.github/workflows/ci.js.yml @@ -16,10 +16,10 @@ jobs: - name: Enable corepack to fix https://github.com/actions/setup-node/pull/901 run: corepack enable pnpm - - name: Use Node.js LTS (20.x) + - name: Use Node.js LTS (22.x) uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b with: - node-version: 20.x + node-version: 22.x cache: 'pnpm' - name: Install project dependencies @@ -33,7 +33,7 @@ jobs: strategy: matrix: - node-version: [20.x, 22.x] + node-version: [22.x] steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 diff --git a/.github/workflows/pr.ci.js.yml b/.github/workflows/pr.ci.js.yml index 182bd5fd0b..48dd8ce660 100644 --- a/.github/workflows/pr.ci.js.yml +++ b/.github/workflows/pr.ci.js.yml @@ -27,10 +27,10 @@ jobs: - name: Enable corepack to fix https://github.com/actions/setup-node/pull/901 run: corepack enable pnpm - - name: Use Node.js LTS (20.x) + - name: Use Node.js LTS (22.x) uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b with: - node-version: 20.x + node-version: 22.x cache: 'pnpm' - name: Install project dependencies @@ -44,7 +44,7 @@ jobs: strategy: matrix: - node-version: [20.x, 22.x] + node-version: [22.x] steps: - name: Checkout PR From 5aebc49005a4827110a6b81c39ae6b75c5721762 Mon Sep 17 00:00:00 2001 From: Cool-Katt Date: Fri, 3 Jan 2025 01:57:34 +0200 Subject: [PATCH 2/3] Fix typo that was introduced while resolving a conflict --- .github/workflows/pr.ci.js.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.ci.js.yml b/.github/workflows/pr.ci.js.yml index 66c9a14db2..c79bc9f987 100644 --- a/.github/workflows/pr.ci.js.yml +++ b/.github/workflows/pr.ci.js.yml @@ -28,7 +28,8 @@ jobs: run: corepack enable pnpm - name: Use Node.js LTS (22.x) - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0bwith: + uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b + with: node-version: 22.x cache: 'pnpm' From d1a5f40accc121e9a1dcaf93ad68a7b726c7b457 Mon Sep 17 00:00:00 2001 From: Derk-Jan Karrenbeld Date: Fri, 3 Jan 2025 01:32:42 +0100 Subject: [PATCH 3/3] Fix whitespace --- .github/workflows/action-format.yml | 2 +- .github/workflows/ci.js.yml | 2 +- .github/workflows/pr.ci.js.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/action-format.yml b/.github/workflows/action-format.yml index db064bf108..a86c8dfa47 100644 --- a/.github/workflows/action-format.yml +++ b/.github/workflows/action-format.yml @@ -62,7 +62,7 @@ jobs: - name: Enable corepack to fix https://github.com/actions/setup-node/pull/901 run: corepack enable pnpm - + - name: Use Node.js LTS (22.x) uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b with: diff --git a/.github/workflows/ci.js.yml b/.github/workflows/ci.js.yml index d7e678736f..b529de1231 100644 --- a/.github/workflows/ci.js.yml +++ b/.github/workflows/ci.js.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Enable corepack to fix https://github.com/actions/setup-node/pull/901 run: corepack enable pnpm - + - name: Use Node.js LTS (22.x) uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b with: diff --git a/.github/workflows/pr.ci.js.yml b/.github/workflows/pr.ci.js.yml index c79bc9f987..a35dafe746 100644 --- a/.github/workflows/pr.ci.js.yml +++ b/.github/workflows/pr.ci.js.yml @@ -26,7 +26,7 @@ jobs: - name: Enable corepack to fix https://github.com/actions/setup-node/pull/901 run: corepack enable pnpm - + - name: Use Node.js LTS (22.x) uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b with: