diff options
| author | bors <bors@rust-lang.org> | 2025-07-07 05:04:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-07-07 05:04:39 +0000 |
| commit | c720f49c46ec3e70bbc2bbb3e0dd1fe7fc0a47f2 (patch) | |
| tree | 13fdaae0102dd2f0954c796bcd4cdf21be4d4a0d /src/ci | |
| parent | 0d11be5aabe0cd49609fff5fce57c4691a22fe55 (diff) | |
| parent | 5dc77ba6586ded662d4c5447da87a70d8a77651a (diff) | |
| download | rust-c720f49c46ec3e70bbc2bbb3e0dd1fe7fc0a47f2.tar.gz rust-c720f49c46ec3e70bbc2bbb3e0dd1fe7fc0a47f2.zip | |
Auto merge of #143048 - Kobzol:bootstrap-check-stage-1, r=jieyouxu
Enforce in bootstrap that check must have stage at least 1 This PR is another step towards https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Proposal.20to.20cleanup.20stages.20and.20steps.20after.20the.20redesign/with/523586917, this time dealing with `x check`. It enforces the invariant that: - We check std stage N with rustc stage N - We check everything else stage N with rustc stage N - 1 It creates a single function that prepares a proper build compiler for checking something, and also adds snapshot tests for various common check steps. Some obsolete code was also removed. The default check stage also becomes 1, for all profiles. I tested manually that `x check std` with `download-ci-rustc` still works and doesn't build rustc locally. Closes: https://github.com/rust-lang/rust/pull/139170 r? `@ghost`
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/host-x86_64/pr-check-1/Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ci/docker/host-x86_64/pr-check-1/Dockerfile b/src/ci/docker/host-x86_64/pr-check-1/Dockerfile index 7a8056b70dc..8bbcc18e2be 100644 --- a/src/ci/docker/host-x86_64/pr-check-1/Dockerfile +++ b/src/ci/docker/host-x86_64/pr-check-1/Dockerfile @@ -45,11 +45,11 @@ COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/ # We also skip the x86_64-unknown-linux-gnu target as it is well-tested by other jobs. ENV SCRIPT \ /scripts/check-default-config-profiles.sh && \ - python3 ../x.py build --stage 1 src/tools/build-manifest && \ + python3 ../x.py build src/tools/build-manifest && \ python3 ../x.py test --stage 0 src/tools/compiletest && \ python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true && \ - python3 ../x.py check --stage 1 --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \ - python3 ../x.py check --stage 1 --set build.optimized-compiler-builtins=false core alloc std --target=aarch64-unknown-linux-gnu,i686-pc-windows-msvc,i686-unknown-linux-gnu,x86_64-apple-darwin,x86_64-pc-windows-gnu,x86_64-pc-windows-msvc && \ + python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \ + python3 ../x.py check --set build.optimized-compiler-builtins=false core alloc std --target=aarch64-unknown-linux-gnu,i686-pc-windows-msvc,i686-unknown-linux-gnu,x86_64-apple-darwin,x86_64-pc-windows-gnu,x86_64-pc-windows-msvc && \ /scripts/validate-toolstate.sh && \ reuse --include-submodules lint && \ python3 ../x.py test collect-license-metadata && \ |