From fa037a6af3a36eda2f1f0cc1bc7b120f7bd46705 Mon Sep 17 00:00:00 2001 From: Zhi Zhen Date: Sat, 6 Dec 2025 14:43:05 +0800 Subject: [PATCH 1/2] remove corepack usage --- Dockerfile | 3 +-- package.json | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9448e680c..2c9c12f39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,7 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends ca-certificates curl git; \ update-ca-certificates || true; \ - corepack enable; \ - corepack prepare pnpm@10.12.2 --activate; \ + npm install -g pnpm@10.12.2; \ rm -rf /var/lib/apt/lists/* # Copy workspace (build context is the repo root of pgpm-modules) diff --git a/package.json b/package.json index 86768494a..2ec1f71c5 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "publishConfig": { "access": "restricted" }, - "packageManager": "pnpm@10.12.2", "workspaces": [ "packages/*" ], From da098d21772cb34b46f7d73077746ff7fe5966b0 Mon Sep 17 00:00:00 2001 From: Zhi Zhen Date: Sat, 6 Dec 2025 15:28:56 +0800 Subject: [PATCH 2/2] remove corepack usage --- .github/workflows/ci.yml | 17 ++++++++++------- .github/workflows/integration-test.yml | 17 ++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index edc3e410b..2be14d5e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,12 +79,16 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Enable corepack and pnpm - run: | - corepack enable - corepack prepare pnpm@9 --activate - pnpm -v - node -v + - name: Setup pnpm + uses: pnpm/action-setup@v2 + with: + version: 9 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '20' + cache: 'pnpm' - name: Install run: pnpm install @@ -103,4 +107,3 @@ jobs: - name: Test ${{ matrix.package }} run: cd ./packages/${{ matrix.package }} && pnpm test - diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 59dbe3e6f..97fed8a3f 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -52,12 +52,16 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Enable corepack and pnpm - run: | - corepack enable - corepack prepare pnpm@9 --activate - pnpm -v - node -v + - name: Setup pnpm + uses: pnpm/action-setup@v2 + with: + version: 9 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '20' + cache: 'pnpm' - name: Install run: pnpm install @@ -74,4 +78,3 @@ jobs: - name: Run Integration Tests run: ./scripts/test-all-packages.js -