Skip to content

ensure the new solver bootstraps on CI #158129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 2 commits into from
Jun 19, 2026
+9 −7
Merged

ensure the new solver bootstraps on CI #158129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f15206
ensure the new solver bootstraps
lqd Jun 19, 2026
c390ede
change pre-stabilization job name
lqd Jun 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...4/x86_64-gnu-pre-stabilization/Dockerfile → ...gnu-next-trait-solver-polonius/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
8 changes: 5 additions & 3 deletions ...r/scripts/x86_64-gnu-pre-stabilization.sh → .../x86_64-gnu-next-trait-solver-polonius.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ 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
#
# FIXME: we also need to ensure it actually bootstraps.
# 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 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.
Expand Down
4 changes: 2 additions & 2 deletions src/ci/github-actions/jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading