Skip to content

Commit 84590ef

Browse files
authored
Rollup merge of #147473 - Zalathar:check-bootstrap-tools, r=Kobzol
Do `x check` on various bootstrap tools in CI These tools aren't included in a default `x check`, but checking them locally is still useful for maintainers working on the tools themselves: - bootstrap - bump-stage0 - compiletest - coverage-dump - linkchecker - run-make-support - rustdoc-gui-test This PR therefore explicitly checks them in one CI job, to ensure that check builds for them continue to work.
2 parents c33f0b3 + 0be0a0a commit 84590ef

File tree

4 files changed

+21
-2
lines changed

4 files changed

+21
-2
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -821,6 +821,15 @@ tool_check_step!(Compiletest {
821821
default: false,
822822
});
823823

824+
// As with compiletest, rustdoc-gui-test is automatically built when running
825+
// relevant tests. So being able to check it is mainly useful for people
826+
// working on on rustdoc-gui-test itself, or on its compiletest dependency.
827+
tool_check_step!(RustdocGuiTest {
828+
path: "src/tools/rustdoc-gui-test",
829+
mode: Mode::ToolBootstrap,
830+
default: false,
831+
});
832+
824833
tool_check_step!(Linkchecker {
825834
path: "src/tools/linkchecker",
826835
mode: Mode::ToolBootstrap,

src/bootstrap/src/core/builder/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,6 +1071,7 @@ impl<'a> Builder<'a> {
10711071
check::Bootstrap,
10721072
check::RunMakeSupport,
10731073
check::Compiletest,
1074+
check::RustdocGuiTest,
10741075
check::FeaturesStatusDump,
10751076
check::CoverageDump,
10761077
check::Linkchecker,

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,17 @@ COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
4040
# We disable optimized compiler built-ins because that requires a C toolchain for the target.
4141
# We also skip the x86_64-unknown-linux-gnu target as it is well-tested by other jobs.
4242
ENV SCRIPT \
43-
python3 ../x.py check bootstrap && \
43+
# Check some tools that aren't included in `x check` by default, to
44+
# ensure that maintainers can still do check builds locally.
45+
python3 ../x.py check \
46+
bootstrap \
47+
bump-stage0 \
48+
compiletest \
49+
coverage-dump \
50+
linkchecker \
51+
run-make-support \
52+
rustdoc-gui-test \
53+
&& \
4454
/scripts/check-default-config-profiles.sh && \
4555
python3 ../x.py build src/tools/build-manifest && \
4656
python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ RUN sh /scripts/sccache.sh
2828

2929
ENV SCRIPT \
3030
python3 ../x.py check && \
31-
python3 ../x.py check src/tools/bump-stage0 && \
3231
python3 ../x.py clippy ci --stage 2 && \
3332
python3 ../x.py test --stage 1 core alloc std test proc_macro && \
3433
python3 ../x.py test --stage 1 src/tools/compiletest && \

0 commit comments

Comments
 (0)