Skip to content

Commit baa55ae

Browse files
committed
Fix CI
1 parent 18768f0 commit baa55ae

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/bootstrap/src/core/build_steps/check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ impl Step for CodegenBackend {
340340
.arg(builder.src.join(format!("compiler/rustc_codegen_{backend}/Cargo.toml")));
341341
rustc_cargo_env(builder, &mut cargo, target, build_compiler.stage);
342342

343-
let _guard = builder.msg_check(&format!("rustc_codegen_{backend}"), target, None);
343+
let _guard = builder.msg_check(format!("rustc_codegen_{backend}"), target, None);
344344

345345
let stamp = build_stamp::codegen_backend_stamp(builder, build_compiler, target, backend)
346346
.with_prefix("check");

src/ci/docker/host-x86_64/pr-check-1/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
4545
# We also skip the x86_64-unknown-linux-gnu target as it is well-tested by other jobs.
4646
ENV SCRIPT \
4747
/scripts/check-default-config-profiles.sh && \
48-
python3 ../x.py build --stage 1 src/tools/build-manifest && \
48+
python3 ../x.py build src/tools/build-manifest && \
4949
python3 ../x.py test --stage 0 src/tools/compiletest && \
5050
python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true && \
51-
python3 ../x.py check --stage 1 --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \
52-
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 && \
51+
python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \
52+
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 && \
5353
/scripts/validate-toolstate.sh && \
5454
reuse --include-submodules lint && \
5555
python3 ../x.py test collect-license-metadata && \

0 commit comments

Comments
 (0)