From ceda91cf5a4428e68c304e8909b67085fd5af56a Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Sun, 12 Apr 2026 20:45:42 +0200 Subject: [PATCH] Bump pnpm/action-setup from 5 to 6 --- .github/workflows/ci.yml | 8 +++++--- CONTRIBUTING.md | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6951a6c6190..cb84acc2d29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -589,7 +589,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Install pnpm - uses: pnpm/action-setup@v5 + uses: pnpm/action-setup@v6 with: version: 10 @@ -597,7 +597,7 @@ jobs: uses: actions/setup-node@v6 with: # Run integration tests with the oldest supported node version. - node-version: 20 + node-version: 22 - name: Checkout uses: actions/checkout@v6 @@ -618,7 +618,9 @@ jobs: - name: Install ReScript package run: | COMMIT_SHA="${{ needs.pkg-pr-new.outputs.commit_sha }}" - pnpm i "https://pkg.pr.new/rescript-lang/rescript@${COMMIT_SHA}" + # pnpm 10 blocks pkg.pr.new's URL-based platform subdependencies unless block-exotic-subdeps is disabled. + pnpm --config.block-exotic-subdeps=false i \ + "https://pkg.pr.new/rescript-lang/rescript@${COMMIT_SHA}" shell: bash working-directory: ${{ steps.tmp-dir.outputs.path }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 56e76ca0ce8..192ed67ce43 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -496,7 +496,8 @@ npm i "https://pkg.pr.new/rescript-lang/rescript@${PR_NUMBER}" yarn add "rescript@https://pkg.pr.new/rescript-lang/rescript@${PR_NUMBER}" # Use pnpm -pnpm add "https://pkg.pr.new/rescript-lang/rescript@${PR_NUMBER}" +# pnpm 10 blocks pkg.pr.new's URL-based platform subdependencies unless block-exotic-subdeps is disabled. +pnpm --config.block-exotic-subdeps=false add "https://pkg.pr.new/rescript-lang/rescript@${PR_NUMBER}" ``` Then attempt to rebuild your project as you would normally.