From 1f15206477e4ab45d320f5163a3b62709fd01220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Rakic?= Date: Fri, 19 Jun 2026 11:51:21 +0200 Subject: [PATCH 1/2] ensure the new solver bootstraps --- src/ci/docker/scripts/x86_64-gnu-pre-stabilization.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ci/docker/scripts/x86_64-gnu-pre-stabilization.sh b/src/ci/docker/scripts/x86_64-gnu-pre-stabilization.sh index 81c1c4356c342..dd7173a6d40ed 100755 --- a/src/ci/docker/scripts/x86_64-gnu-pre-stabilization.sh +++ b/src/ci/docker/scripts/x86_64-gnu-pre-stabilization.sh @@ -7,10 +7,12 @@ set -ex # 1. For the new trait solver, we want to: # - ensure it can build the standard library +# - ensure it actually bootstraps # -# FIXME: we also need to ensure it actually bootstraps. +# We test both by building the _stage 2_ library with the new solver enabled +# at stage 1 via rustflags. -RUSTFLAGS_NOT_BOOTSTRAP="-Znext-solver=globally" ../x build library --stage 1 +RUSTFLAGS_NOT_BOOTSTRAP="-Znext-solver=globally" ../x build library --stage 2 # 2. For the polonius alpha, we run the UI tests under the polonius # compare-mode. From c390ede877e7301f0176b86bdc3a2b3c4607ba52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Rakic?= Date: Fri, 19 Jun 2026 15:49:12 +0200 Subject: [PATCH 2/2] change pre-stabilization job name --- .../Dockerfile | 4 ++-- ...bilization.sh => x86_64-gnu-next-trait-solver-polonius.sh} | 4 ++-- src/ci/github-actions/jobs.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename src/ci/docker/host-x86_64/{x86_64-gnu-pre-stabilization => x86_64-gnu-next-trait-solver-polonius}/Dockerfile (78%) rename src/ci/docker/scripts/{x86_64-gnu-pre-stabilization.sh => x86_64-gnu-next-trait-solver-polonius.sh} (84%) diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-pre-stabilization/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-next-trait-solver-polonius/Dockerfile similarity index 78% rename from src/ci/docker/host-x86_64/x86_64-gnu-pre-stabilization/Dockerfile rename to src/ci/docker/host-x86_64/x86_64-gnu-next-trait-solver-polonius/Dockerfile index 8b61470aeb5f1..4198092640bfb 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-pre-stabilization/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-gnu-next-trait-solver-polonius/Dockerfile @@ -25,5 +25,5 @@ RUN sh /scripts/sccache.sh ENV RUST_CONFIGURE_ARGS="--build=x86_64-unknown-linux-gnu" -COPY scripts/x86_64-gnu-pre-stabilization.sh /scripts/ -ENV SCRIPT="/scripts/x86_64-gnu-pre-stabilization.sh" +COPY scripts/x86_64-gnu-next-trait-solver-polonius.sh /scripts/ +ENV SCRIPT="/scripts/x86_64-gnu-next-trait-solver-polonius.sh" diff --git a/src/ci/docker/scripts/x86_64-gnu-pre-stabilization.sh b/src/ci/docker/scripts/x86_64-gnu-next-trait-solver-polonius.sh similarity index 84% rename from src/ci/docker/scripts/x86_64-gnu-pre-stabilization.sh rename to src/ci/docker/scripts/x86_64-gnu-next-trait-solver-polonius.sh index dd7173a6d40ed..9d1bc8d409e7b 100755 --- a/src/ci/docker/scripts/x86_64-gnu-pre-stabilization.sh +++ b/src/ci/docker/scripts/x86_64-gnu-next-trait-solver-polonius.sh @@ -5,11 +5,11 @@ set -ex # This script tests features intended to be stabilized in 2026. We want to # ensure they don't regress until then. -# 1. For the new trait solver, we want to: +# 1. For the next trait solver, we want to: # - ensure it can build the standard library # - ensure it actually bootstraps # -# We test both by building the _stage 2_ library with the new solver enabled +# We test both by building the _stage 2_ library with the next solver enabled # at stage 1 via rustflags. RUSTFLAGS_NOT_BOOTSTRAP="-Znext-solver=globally" ../x build library --stage 2 diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 2f92a30065b1f..25593f1ea238f 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -159,8 +159,8 @@ pr: # This job tests features we want to stabilize soon, to ensure they don't # regress. - - name: x86_64-gnu-pre-stabilization - doc_url: https://rustc-dev-guide.rust-lang.org/tests/pre-stabilization-ci-job.html + - name: x86_64-gnu-next-trait-solver-polonius + doc_url: https://rustc-dev-guide.rust-lang.org/tests/x86_64-gnu-next-trait-solver-polonius-ci-job.html env: CODEGEN_BACKENDS: llvm <<: *job-linux-4c