From 564e8d51141f3b7d7321b42480b40b8f1f6756c9 Mon Sep 17 00:00:00 2001 From: Jonah Snider Date: Wed, 15 Jul 2026 10:09:10 -0700 Subject: [PATCH 1/2] feat: support installing Yarn 6 binaries --- src/cli/tools/node/npm.ts | 5 +++++ test/node/Dockerfile | 5 +++++ test/node/Dockerfile.arm64 | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/src/cli/tools/node/npm.ts b/src/cli/tools/node/npm.ts index 39bbc4df86..11cfd7f5ce 100644 --- a/src/cli/tools/node/npm.ts +++ b/src/cli/tools/node/npm.ts @@ -27,6 +27,11 @@ export class YarnInstallService extends NpmBaseInstallService { protected override tool(version: string): string { const ver = parse(version); + if (ver.major >= 6) { + const arch = this.envSvc.arch === 'arm64' ? 'aarch64' : 'x86_64'; + logger.debug({ version, arch }, 'Using native yarn package'); + return `@yarnpkg/yarn-${arch}-unknown-linux-musl`; + } if (ver.major >= 2) { logger.debug({ version }, 'Using yarnpkg/cli-dist'); return '@yarnpkg/cli-dist'; diff --git a/test/node/Dockerfile b/test/node/Dockerfile index 31b7cb7503..823a770843 100644 --- a/test/node/Dockerfile +++ b/test/node/Dockerfile @@ -95,6 +95,11 @@ RUN install-tool yarn 3.8.1 # renovate: datasource=npm packageName=@yarnpkg/cli-dist RUN install-tool yarn 4.17.1 +# renovate: datasource=npm packageName=@yarnpkg/yarn-x86_64-unknown-linux-musl +RUN install-tool yarn 6.0.0-rc.19 + +RUN test "$(yarn --version)" = "6.0.0-rc.19" + #-------------------------------------- # test: pnpm #-------------------------------------- diff --git a/test/node/Dockerfile.arm64 b/test/node/Dockerfile.arm64 index 4e316774a8..d6f68bb714 100644 --- a/test/node/Dockerfile.arm64 +++ b/test/node/Dockerfile.arm64 @@ -57,6 +57,11 @@ FROM test-node AS test-yarn # renovate: datasource=npm RUN install-tool yarn 1.22.22 +# renovate: datasource=npm packageName=@yarnpkg/yarn-aarch64-unknown-linux-musl +RUN install-tool yarn 6.0.0-rc.19 + +RUN test "$(yarn --version)" = "6.0.0-rc.19" + #-------------------------------------- # Image: renovate #-------------------------------------- From 87bdec2b4957e1b5d79acf919acd67a7d6fe67e6 Mon Sep 17 00:00:00 2001 From: Jonah Snider Date: Mon, 27 Jul 2026 11:15:07 -0700 Subject: [PATCH 2/2] test: improve robustness of Yarn tests --- test/node/Dockerfile | 6 ++++-- test/node/Dockerfile.arm64 | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/test/node/Dockerfile b/test/node/Dockerfile index 823a770843..6c2ca131ec 100644 --- a/test/node/Dockerfile +++ b/test/node/Dockerfile @@ -96,9 +96,11 @@ RUN install-tool yarn 3.8.1 RUN install-tool yarn 4.17.1 # renovate: datasource=npm packageName=@yarnpkg/yarn-x86_64-unknown-linux-musl -RUN install-tool yarn 6.0.0-rc.19 +ARG YARN_VERSION=6.0.0-rc.19 -RUN test "$(yarn --version)" = "6.0.0-rc.19" +RUN install-tool yarn "${YARN_VERSION}" + +RUN test "$(yarn --version)" = "${YARN_VERSION}" #-------------------------------------- # test: pnpm diff --git a/test/node/Dockerfile.arm64 b/test/node/Dockerfile.arm64 index d6f68bb714..d6fb0e4d64 100644 --- a/test/node/Dockerfile.arm64 +++ b/test/node/Dockerfile.arm64 @@ -58,9 +58,11 @@ FROM test-node AS test-yarn RUN install-tool yarn 1.22.22 # renovate: datasource=npm packageName=@yarnpkg/yarn-aarch64-unknown-linux-musl -RUN install-tool yarn 6.0.0-rc.19 +ARG YARN_VERSION=6.0.0-rc.19 -RUN test "$(yarn --version)" = "6.0.0-rc.19" +RUN install-tool yarn "${YARN_VERSION}" + +RUN test "$(yarn --version)" = "${YARN_VERSION}" #-------------------------------------- # Image: renovate