From 1535b7c3600f7bb9d7ff4efad2b6e57f1314081a Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 4 Feb 2025 20:21:23 +0800 Subject: [PATCH 01/16] ci: fix corepack key id mismatch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c203b486612c..3d0fbff36fea 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "webpack-cli": "5.1.4", "zx": "8.3.0" }, - "packageManager": "pnpm@9.15.4", + "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0", "pnpm": { "patchedDependencies": { "graceful-fs@4.2.10": "patches/graceful-fs@4.2.10.patch", From d280b9133d534ef44ee6a9378498cb18460213b6 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 4 Feb 2025 20:26:08 +0800 Subject: [PATCH 02/16] fix: pnpm --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3d0fbff36fea..9fceecc952d8 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "url": "https://github.com/web-infra-dev/rspack" }, "engines": { - "pnpm": "9.15.4" + "pnpm": "9.15.5" }, "devDependencies": { "@biomejs/biome": "1.9.4", @@ -82,7 +82,7 @@ "webpack-cli": "5.1.4", "zx": "8.3.0" }, - "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0", + "packageManager": "pnpm@9.15.5+sha512.845196026aab1cc3f098a0474b64dfbab2afe7a1b4e91dd86895d8e4aa32a7a6d03049e2d0ad770bbe4de023a7122fb68c1a1d6e0d033c7076085f9d5d4800d4", "pnpm": { "patchedDependencies": { "graceful-fs@4.2.10": "patches/graceful-fs@4.2.10.patch", From 0cbbf5c1f28e3ee43e59a28f2cb317abd5d58c98 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 4 Feb 2025 20:28:09 +0800 Subject: [PATCH 03/16] fix: pnpm --- .github/actions/docker-build/action.yml | 5 +---- .github/actions/pnpm-cache/action.yml | 1 + package.json | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/actions/docker-build/action.yml b/.github/actions/docker-build/action.yml index 29dc0e014695..056b24dbe43f 100644 --- a/.github/actions/docker-build/action.yml +++ b/.github/actions/docker-build/action.yml @@ -42,10 +42,7 @@ runs: ${{ inputs.pre }} rustup target add ${{ inputs.target }} - # corepack > 0.24.1 will use native fetch - # and native fetch not support HTTP_PROXY - # https://github.com/nodejs/undici/issues/1650 - npm install -g corepack@0.24.1 + npm install -g corepack@latest --force corepack enable RUST_TARGET=${{ inputs.target }} pnpm build:binding:${{ inputs.profile }} diff --git a/.github/actions/pnpm-cache/action.yml b/.github/actions/pnpm-cache/action.yml index 633d6b8ff2b7..1661557c38a2 100644 --- a/.github/actions/pnpm-cache/action.yml +++ b/.github/actions/pnpm-cache/action.yml @@ -28,6 +28,7 @@ runs: if: ${{ inputs.node-version != '16' }} shell: bash run: | + npm install -g corepack@latest --force corepack enable # https://pnpm.io/continuous-integration#github-actions diff --git a/package.json b/package.json index 9fceecc952d8..c203b486612c 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "url": "https://github.com/web-infra-dev/rspack" }, "engines": { - "pnpm": "9.15.5" + "pnpm": "9.15.4" }, "devDependencies": { "@biomejs/biome": "1.9.4", @@ -82,7 +82,7 @@ "webpack-cli": "5.1.4", "zx": "8.3.0" }, - "packageManager": "pnpm@9.15.5+sha512.845196026aab1cc3f098a0474b64dfbab2afe7a1b4e91dd86895d8e4aa32a7a6d03049e2d0ad770bbe4de023a7122fb68c1a1d6e0d033c7076085f9d5d4800d4", + "packageManager": "pnpm@9.15.4", "pnpm": { "patchedDependencies": { "graceful-fs@4.2.10": "patches/graceful-fs@4.2.10.patch", From 618a0f19ee2936dc442a5754c11403172b577391 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 4 Feb 2025 20:31:59 +0800 Subject: [PATCH 04/16] chore: echo --- .github/actions/docker-build/action.yml | 1 + .github/actions/pnpm-cache/action.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/actions/docker-build/action.yml b/.github/actions/docker-build/action.yml index 056b24dbe43f..9a54d09bdf25 100644 --- a/.github/actions/docker-build/action.yml +++ b/.github/actions/docker-build/action.yml @@ -43,6 +43,7 @@ runs: rustup target add ${{ inputs.target }} npm install -g corepack@latest --force + echo "Corepack version: $(corepack --version)" corepack enable RUST_TARGET=${{ inputs.target }} pnpm build:binding:${{ inputs.profile }} diff --git a/.github/actions/pnpm-cache/action.yml b/.github/actions/pnpm-cache/action.yml index 1661557c38a2..a7b95570c304 100644 --- a/.github/actions/pnpm-cache/action.yml +++ b/.github/actions/pnpm-cache/action.yml @@ -29,6 +29,7 @@ runs: shell: bash run: | npm install -g corepack@latest --force + echo "Corepack version: $(corepack --version)" corepack enable # https://pnpm.io/continuous-integration#github-actions From 31120210da24a5b3308636e13409d06dfd4493ee Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 4 Feb 2025 20:34:42 +0800 Subject: [PATCH 05/16] fix: pin --- .github/actions/docker-build/action.yml | 2 +- .github/actions/pnpm-cache/action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/docker-build/action.yml b/.github/actions/docker-build/action.yml index 9a54d09bdf25..68adff6b4620 100644 --- a/.github/actions/docker-build/action.yml +++ b/.github/actions/docker-build/action.yml @@ -42,7 +42,7 @@ runs: ${{ inputs.pre }} rustup target add ${{ inputs.target }} - npm install -g corepack@latest --force + npm install -g corepack@0.31.0 --force echo "Corepack version: $(corepack --version)" corepack enable diff --git a/.github/actions/pnpm-cache/action.yml b/.github/actions/pnpm-cache/action.yml index a7b95570c304..1c19d3493265 100644 --- a/.github/actions/pnpm-cache/action.yml +++ b/.github/actions/pnpm-cache/action.yml @@ -28,7 +28,7 @@ runs: if: ${{ inputs.node-version != '16' }} shell: bash run: | - npm install -g corepack@latest --force + npm install -g corepack@0.31.0 --force echo "Corepack version: $(corepack --version)" corepack enable From ac809f477d3263b5aecad7ba3d787cd1b38e7873 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 4 Feb 2025 20:48:28 +0800 Subject: [PATCH 06/16] fix: try remove --force --- .github/actions/docker-build/action.yml | 2 +- .github/actions/pnpm-cache/action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/docker-build/action.yml b/.github/actions/docker-build/action.yml index 68adff6b4620..4e30783c2b9a 100644 --- a/.github/actions/docker-build/action.yml +++ b/.github/actions/docker-build/action.yml @@ -42,7 +42,7 @@ runs: ${{ inputs.pre }} rustup target add ${{ inputs.target }} - npm install -g corepack@0.31.0 --force + npm install -g corepack@0.31.0 echo "Corepack version: $(corepack --version)" corepack enable diff --git a/.github/actions/pnpm-cache/action.yml b/.github/actions/pnpm-cache/action.yml index 1c19d3493265..892badab4aaa 100644 --- a/.github/actions/pnpm-cache/action.yml +++ b/.github/actions/pnpm-cache/action.yml @@ -28,7 +28,7 @@ runs: if: ${{ inputs.node-version != '16' }} shell: bash run: | - npm install -g corepack@0.31.0 --force + npm install -g corepack@0.31.0 echo "Corepack version: $(corepack --version)" corepack enable From 81f3179c9eee17e4849ac79769ae34b785e8f9e0 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 4 Feb 2025 20:54:03 +0800 Subject: [PATCH 07/16] Revert "fix: try remove --force" This reverts commit ac809f477d3263b5aecad7ba3d787cd1b38e7873. --- .github/actions/docker-build/action.yml | 2 +- .github/actions/pnpm-cache/action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/docker-build/action.yml b/.github/actions/docker-build/action.yml index 4e30783c2b9a..68adff6b4620 100644 --- a/.github/actions/docker-build/action.yml +++ b/.github/actions/docker-build/action.yml @@ -42,7 +42,7 @@ runs: ${{ inputs.pre }} rustup target add ${{ inputs.target }} - npm install -g corepack@0.31.0 + npm install -g corepack@0.31.0 --force echo "Corepack version: $(corepack --version)" corepack enable diff --git a/.github/actions/pnpm-cache/action.yml b/.github/actions/pnpm-cache/action.yml index 892badab4aaa..1c19d3493265 100644 --- a/.github/actions/pnpm-cache/action.yml +++ b/.github/actions/pnpm-cache/action.yml @@ -28,7 +28,7 @@ runs: if: ${{ inputs.node-version != '16' }} shell: bash run: | - npm install -g corepack@0.31.0 + npm install -g corepack@0.31.0 --force echo "Corepack version: $(corepack --version)" corepack enable From a6df47ce599516f34dab77d2cee38116f8ab5acf Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 4 Feb 2025 21:07:54 +0800 Subject: [PATCH 08/16] fix: try uninstall --- .github/actions/docker-build/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/docker-build/action.yml b/.github/actions/docker-build/action.yml index 68adff6b4620..5a4333a11070 100644 --- a/.github/actions/docker-build/action.yml +++ b/.github/actions/docker-build/action.yml @@ -42,7 +42,8 @@ runs: ${{ inputs.pre }} rustup target add ${{ inputs.target }} - npm install -g corepack@0.31.0 --force + npm uninstall -g corepack + npm install -g corepack@0.31.0 --force --location=global echo "Corepack version: $(corepack --version)" corepack enable From afc012dad3eedeb22087dbd27ed7a131cfe92321 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 4 Feb 2025 21:10:36 +0800 Subject: [PATCH 09/16] fix: ci --- .github/actions/pnpm-cache/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/pnpm-cache/action.yml b/.github/actions/pnpm-cache/action.yml index 1c19d3493265..edaae439f97a 100644 --- a/.github/actions/pnpm-cache/action.yml +++ b/.github/actions/pnpm-cache/action.yml @@ -28,6 +28,7 @@ runs: if: ${{ inputs.node-version != '16' }} shell: bash run: | + npm uninstall -g corepack npm install -g corepack@0.31.0 --force echo "Corepack version: $(corepack --version)" corepack enable From e9024acb7b7ff1e5c22ad615b860ab129adc353c Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 4 Feb 2025 21:12:50 +0800 Subject: [PATCH 10/16] fix: do not use corepack --- .github/actions/pnpm-cache/action.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/actions/pnpm-cache/action.yml b/.github/actions/pnpm-cache/action.yml index edaae439f97a..147ea9d84286 100644 --- a/.github/actions/pnpm-cache/action.yml +++ b/.github/actions/pnpm-cache/action.yml @@ -24,24 +24,14 @@ runs: with: node-version: ${{ inputs.node-version }} - - name: Enable corepack - if: ${{ inputs.node-version != '16' }} - shell: bash - run: | - npm uninstall -g corepack - npm install -g corepack@0.31.0 --force - echo "Corepack version: $(corepack --version)" - corepack enable - # https://pnpm.io/continuous-integration#github-actions # Uses `packageManagement` field from package.json - name: Install pnpm uses: pnpm/action-setup@v4 - if: ${{ inputs.node-version == '16' }} with: dest: ${{ runner.tool_cache }}/pnpm # Use `@pnpm/exe` for Node 16 - standalone: true + standalone: ${{ inputs.node-version == '16' }} - name: Get pnpm store directory id: pnpm-cache From 02cf4fc5970eea88a47e93eb7b4207ea0484e5f8 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 4 Feb 2025 21:50:09 +0800 Subject: [PATCH 11/16] Revert "fix: do not use corepack" This reverts commit e9024acb7b7ff1e5c22ad615b860ab129adc353c. --- .github/actions/pnpm-cache/action.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/actions/pnpm-cache/action.yml b/.github/actions/pnpm-cache/action.yml index 147ea9d84286..edaae439f97a 100644 --- a/.github/actions/pnpm-cache/action.yml +++ b/.github/actions/pnpm-cache/action.yml @@ -24,14 +24,24 @@ runs: with: node-version: ${{ inputs.node-version }} + - name: Enable corepack + if: ${{ inputs.node-version != '16' }} + shell: bash + run: | + npm uninstall -g corepack + npm install -g corepack@0.31.0 --force + echo "Corepack version: $(corepack --version)" + corepack enable + # https://pnpm.io/continuous-integration#github-actions # Uses `packageManagement` field from package.json - name: Install pnpm uses: pnpm/action-setup@v4 + if: ${{ inputs.node-version == '16' }} with: dest: ${{ runner.tool_cache }}/pnpm # Use `@pnpm/exe` for Node 16 - standalone: ${{ inputs.node-version == '16' }} + standalone: true - name: Get pnpm store directory id: pnpm-cache From 4f71800699347500018c078b7b5ecd51dcb11210 Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 5 Feb 2025 10:25:34 +0800 Subject: [PATCH 12/16] fix: try another --- .github/actions/docker-build/action.yml | 8 +++++--- .github/actions/pnpm-cache/action.yml | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/docker-build/action.yml b/.github/actions/docker-build/action.yml index 5a4333a11070..ff8f1143073e 100644 --- a/.github/actions/docker-build/action.yml +++ b/.github/actions/docker-build/action.yml @@ -42,10 +42,12 @@ runs: ${{ inputs.pre }} rustup target add ${{ inputs.target }} - npm uninstall -g corepack - npm install -g corepack@0.31.0 --force --location=global + # corepack > 0.24.1 will use native fetch + # and native fetch not support HTTP_PROXY + # https://github.com/nodejs/undici/issues/1650 echo "Corepack version: $(corepack --version)" - corepack enable + npm install -g corepack@0.24.1 + COREPACK_INTEGRITY_KEYS=0 corepack enable RUST_TARGET=${{ inputs.target }} pnpm build:binding:${{ inputs.profile }} ${{ inputs.post }} diff --git a/.github/actions/pnpm-cache/action.yml b/.github/actions/pnpm-cache/action.yml index edaae439f97a..19876a6941b1 100644 --- a/.github/actions/pnpm-cache/action.yml +++ b/.github/actions/pnpm-cache/action.yml @@ -28,10 +28,8 @@ runs: if: ${{ inputs.node-version != '16' }} shell: bash run: | - npm uninstall -g corepack - npm install -g corepack@0.31.0 --force echo "Corepack version: $(corepack --version)" - corepack enable + COREPACK_INTEGRITY_KEYS=0 corepack enable # https://pnpm.io/continuous-integration#github-actions # Uses `packageManagement` field from package.json From 25d96dc761142b4c01124569c038c8e72248f5e7 Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 5 Feb 2025 10:42:20 +0800 Subject: [PATCH 13/16] Revert "fix: try another" This reverts commit 4f71800699347500018c078b7b5ecd51dcb11210. --- .github/actions/docker-build/action.yml | 8 +++----- .github/actions/pnpm-cache/action.yml | 4 +++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/docker-build/action.yml b/.github/actions/docker-build/action.yml index ff8f1143073e..5a4333a11070 100644 --- a/.github/actions/docker-build/action.yml +++ b/.github/actions/docker-build/action.yml @@ -42,12 +42,10 @@ runs: ${{ inputs.pre }} rustup target add ${{ inputs.target }} - # corepack > 0.24.1 will use native fetch - # and native fetch not support HTTP_PROXY - # https://github.com/nodejs/undici/issues/1650 + npm uninstall -g corepack + npm install -g corepack@0.31.0 --force --location=global echo "Corepack version: $(corepack --version)" - npm install -g corepack@0.24.1 - COREPACK_INTEGRITY_KEYS=0 corepack enable + corepack enable RUST_TARGET=${{ inputs.target }} pnpm build:binding:${{ inputs.profile }} ${{ inputs.post }} diff --git a/.github/actions/pnpm-cache/action.yml b/.github/actions/pnpm-cache/action.yml index 19876a6941b1..edaae439f97a 100644 --- a/.github/actions/pnpm-cache/action.yml +++ b/.github/actions/pnpm-cache/action.yml @@ -28,8 +28,10 @@ runs: if: ${{ inputs.node-version != '16' }} shell: bash run: | + npm uninstall -g corepack + npm install -g corepack@0.31.0 --force echo "Corepack version: $(corepack --version)" - COREPACK_INTEGRITY_KEYS=0 corepack enable + corepack enable # https://pnpm.io/continuous-integration#github-actions # Uses `packageManagement` field from package.json From 84d990f33a116160444d45dd2efe0afec097706d Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 5 Feb 2025 10:42:44 +0800 Subject: [PATCH 14/16] fix: location --- .github/actions/pnpm-cache/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/pnpm-cache/action.yml b/.github/actions/pnpm-cache/action.yml index edaae439f97a..852ae587d978 100644 --- a/.github/actions/pnpm-cache/action.yml +++ b/.github/actions/pnpm-cache/action.yml @@ -29,7 +29,7 @@ runs: shell: bash run: | npm uninstall -g corepack - npm install -g corepack@0.31.0 --force + npm install -g corepack@0.31.0 --force --location=global echo "Corepack version: $(corepack --version)" corepack enable From 408e7d495f815ca0a71e7cb00037632abffce49e Mon Sep 17 00:00:00 2001 From: jerrykingxyz Date: Wed, 5 Feb 2025 13:21:44 +0800 Subject: [PATCH 15/16] fix: windows corepack not work --- .github/actions/pnpm-cache/action.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/actions/pnpm-cache/action.yml b/.github/actions/pnpm-cache/action.yml index 852ae587d978..74d147ebe396 100644 --- a/.github/actions/pnpm-cache/action.yml +++ b/.github/actions/pnpm-cache/action.yml @@ -28,6 +28,11 @@ runs: if: ${{ inputs.node-version != '16' }} shell: bash run: | + if [[ "${{runner.os}}" == "Windows" ]]; then + # add the npm prefix to PATH to ensure the installed corepack work properly + NPM_PREFIX=$(cygpath -u "$(npm config get prefix)") + export PATH="$NPM_PREFIX:$PATH" + fi npm uninstall -g corepack npm install -g corepack@0.31.0 --force --location=global echo "Corepack version: $(corepack --version)" From d773ab32f3eb8987076584a685fd3557a0a102c3 Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 5 Feb 2025 13:26:51 +0800 Subject: [PATCH 16/16] ci: remove unused code --- .github/actions/docker-build/action.yml | 3 +-- .github/actions/pnpm-cache/action.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/actions/docker-build/action.yml b/.github/actions/docker-build/action.yml index 5a4333a11070..68adff6b4620 100644 --- a/.github/actions/docker-build/action.yml +++ b/.github/actions/docker-build/action.yml @@ -42,8 +42,7 @@ runs: ${{ inputs.pre }} rustup target add ${{ inputs.target }} - npm uninstall -g corepack - npm install -g corepack@0.31.0 --force --location=global + npm install -g corepack@0.31.0 --force echo "Corepack version: $(corepack --version)" corepack enable diff --git a/.github/actions/pnpm-cache/action.yml b/.github/actions/pnpm-cache/action.yml index 74d147ebe396..6741740a3531 100644 --- a/.github/actions/pnpm-cache/action.yml +++ b/.github/actions/pnpm-cache/action.yml @@ -33,8 +33,7 @@ runs: NPM_PREFIX=$(cygpath -u "$(npm config get prefix)") export PATH="$NPM_PREFIX:$PATH" fi - npm uninstall -g corepack - npm install -g corepack@0.31.0 --force --location=global + npm install -g corepack@0.31.0 --force echo "Corepack version: $(corepack --version)" corepack enable