Skip to content

Commit d28cb1c

Browse files
committed
use stage 1 for std on CI
Signed-off-by: onur-ozkan <[email protected]>
1 parent 0803f62 commit d28cb1c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/ci/docker/host-x86_64/mingw-check/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,20 @@ COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/
4545
# We disable optimized compiler built-ins because that requires a C toolchain for the target.
4646
# We also skip the x86_64-unknown-linux-gnu target as it is well-tested by other jobs.
4747
ENV SCRIPT \
48-
python3 ../x.py check --stage 0 --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 && \
48+
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 && \
4949
/scripts/check-default-config-profiles.sh && \
5050
python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true && \
5151
python3 ../x.py check --target=x86_64-pc-windows-gnu --host=x86_64-pc-windows-gnu && \
5252
python3 ../x.py clippy ci && \
5353
python3 ../x.py build --stage 0 src/tools/build-manifest && \
5454
python3 ../x.py test --stage 0 src/tools/compiletest && \
55-
python3 ../x.py test --stage 0 core alloc std test proc_macro && \
55+
python3 ../x.py test --stage 1 core alloc std test proc_macro && \
5656
# Build both public and internal documentation.
57-
RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc --stage 0 library && \
57+
RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc --stage 1 library && \
5858
mkdir -p /checkout/obj/staging/doc && \
5959
cp -r build/x86_64-unknown-linux-gnu/doc /checkout/obj/staging && \
6060
RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc --stage 0 compiler && \
61-
RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc --stage 0 library/test && \
61+
RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc --stage 1 library/test && \
6262
/scripts/validate-toolstate.sh && \
6363
/scripts/validate-error-codes.sh && \
6464
reuse --include-submodules lint && \

src/ci/docker/host-x86_64/x86_64-gnu-nopt/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ RUN echo "optimize = false" >> /config/nopt-std-config.toml
2929
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu \
3030
--disable-optimize-tests \
3131
--set rust.test-compare-mode
32-
ENV SCRIPT python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std \
32+
ENV SCRIPT python3 ../x.py test --stage 1 --config /config/nopt-std-config.toml library/std \
3333
&& python3 ../x.py --stage 2 test

src/ci/github-actions/jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ auto:
281281
env:
282282
IMAGE: i686-gnu-nopt
283283
DOCKER_SCRIPT: >-
284-
python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std &&
284+
python3 ../x.py test --stage 1 --config /config/nopt-std-config.toml library/std &&
285285
/scripts/stage_2_test_set2.sh
286286
<<: *job-linux-4c
287287

0 commit comments

Comments
 (0)