Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions src/bootstrap/src/core/build_steps/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,15 @@ tool_check_step!(Compiletest {
default: false,
});

// As with compiletest, rustdoc-gui-test is automatically built when running
// relevant tests. So being able to check it is mainly useful for people
// working on on rustdoc-gui-test itself, or on its compiletest dependency.
tool_check_step!(RustdocGuiTest {
path: "src/tools/rustdoc-gui-test",
mode: Mode::ToolBootstrap,
default: false,
});

tool_check_step!(Linkchecker {
path: "src/tools/linkchecker",
mode: Mode::ToolBootstrap,
Expand Down
1 change: 1 addition & 0 deletions src/bootstrap/src/core/builder/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1071,6 +1071,7 @@ impl<'a> Builder<'a> {
check::Bootstrap,
check::RunMakeSupport,
check::Compiletest,
check::RustdocGuiTest,
check::FeaturesStatusDump,
check::CoverageDump,
check::Linkchecker,
Expand Down
4 changes: 4 additions & 0 deletions src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,8 @@ ENV RUST_CONFIGURE_ARGS \
--enable-profiler \
--enable-compiler-docs
ENV SCRIPT python3 ../x.py --stage 2 test && \
# Check some tools that aren't included in `x check` by default, to ensure
# that maintainers can still do check builds locally.
python3 ../x.py check bootstrap bump-stage0 compiletest coverage-dump \
linkchecker run-make-support rustdoc-gui-test && \
python3 ../x.py --stage 2 test src/tools/cargo
5 changes: 4 additions & 1 deletion src/ci/docker/host-x86_64/pr-check-2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ RUN sh /scripts/sccache.sh

ENV SCRIPT \
python3 ../x.py check && \
python3 ../x.py check src/tools/bump-stage0 && \
# Check some tools that aren't included in `x check` by default, to
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All PR jobs now also run in auto CI, so you can remove the change from aarch64-gnu.

# ensure that maintainers can still do check builds locally.
python3 ../x.py check bootstrap bump-stage0 compiletest coverage-dump \
linkchecker run-make-support rustdoc-gui-test && \
python3 ../x.py clippy ci --stage 2 && \
python3 ../x.py test --stage 1 core alloc std test proc_macro && \
python3 ../x.py test --stage 1 src/tools/compiletest && \
Expand Down
Loading