From 76cedbce82b4bf79bb8aab8ac0bae71fb0949770 Mon Sep 17 00:00:00 2001 From: Luke Karrys Date: Mon, 21 Sep 2026 12:59:19 -0700 Subject: [PATCH] fix: pin Yarn canary to available ARM64 release --- .github/workflows/benchmark.yaml | 4 ++++ scripts/setup.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index 04b5afe803..f9b6e595ca 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -126,6 +126,8 @@ jobs: contents: read id-token: write env: + # rc.21 is advertised by the canary channel but its Linux ARM64 npm binary is missing. + BENCH_ZPM_VERSION: "6.0.0-rc.20" BENCH_INCLUDE: ${{ fromJson(inputs.binaries || '"npm,yarn,berry,zpm,pnpm,pacquet,vlt,bun,deno,aube,nx,turbo,vp,node"') }} BENCH_WARMUP: ${{ (github.event_name == 'push' && github.ref != 'refs/heads/main') && '1' || (inputs.warmup || '2') }} BENCH_RUNS: ${{ (github.event_name == 'push' && github.ref != 'refs/heads/main') && '1' || (inputs.runs || '5') }} @@ -203,12 +205,14 @@ jobs: --fixtures="${{ matrix.fixture }}" \ --variation="${{ matrix.variation }}" - name: Upload Benchmark Results + if: ${{ !cancelled() }} uses: actions/upload-artifact@v7 with: name: results-${{ matrix.fixture }}-${{ matrix.variation }} path: ./results/${{ matrix.fixture }}/${{ matrix.variation }}/ retention-days: 7 - name: Upload Versions Info + if: ${{ !cancelled() }} uses: actions/upload-artifact@v7 with: name: versions-${{ matrix.fixture }}-${{ matrix.variation }} diff --git a/scripts/setup.sh b/scripts/setup.sh index bb73395051..dc88c4fe03 100644 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -96,7 +96,7 @@ NPM_VERSION="$(npm -v)" VLT_VERSION="$(vlt -v)" YARN_VERSION="$(corepack yarn@1 -v)" BERRY_VERSION="$(corepack yarn@latest -v)" -ZPM_VERSION="$(curl https://repo.yarnpkg.com/channels/default/canary)" +ZPM_VERSION="${BENCH_ZPM_VERSION:-$(curl -fsSL https://repo.yarnpkg.com/channels/default/canary)}" PNPM_VERSION="$(corepack pnpm@latest -v)" PACQUET_VERSION="$(/tmp/pnpm12/bin/pnpm --version)" BUN_VERSION="$(bun -v)"