Skip to content
Merged
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
4 changes: 2 additions & 2 deletions src/bootstrap/mk/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ TEST_SET2 := --skip=tests --skip=coverage-map --skip=coverage-run --skip=library

# this intentionally doesn't use `$(BOOTSTRAP)` so we can test the shebang on Windows
ci-msvc-py:
$(Q)$(CFG_SRC_DIR)/x.py test --stage 2 $(TEST_SET1)
$(Q)$(CFG_SRC_DIR)/x.py test --stage 2 $(TEST_SET1) --skip=src/tools/linkchecker
ci-msvc-ps1:
$(Q)$(CFG_SRC_DIR)/x.ps1 test --stage 2 $(TEST_SET2)
$(Q)$(CFG_SRC_DIR)/x.ps1 test --stage 2 $(TEST_SET2) --skip=src/tools/linkchecker
ci-msvc: ci-msvc-py ci-msvc-ps1

## MingW native builders
Expand Down
7 changes: 7 additions & 0 deletions src/bootstrap/src/core/build_steps/doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1392,6 +1392,13 @@ impl Step for RustcBook {
/// in the "md-doc" directory in the build output directory. Then
/// "rustbook" is used to convert it to HTML.
fn run(self, builder: &Builder<'_>) {
// FIXME: Temporary workaround for https://github.com/rust-lang/rust/issues/158378
#[cfg(not(test))] // So this check doesn't affect the bootstrap tests
if self.target == "i686-pc-windows-msvc" {
eprintln!("WARNING: Skipping rustc book build to work around #158378");
return;
}

let out_base = builder.md_doc_out(self.target).join("rustc");
t!(fs::create_dir_all(&out_base));
let out_listing = out_base.join("src/lints");
Expand Down
3 changes: 2 additions & 1 deletion src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ pr:
env:
CODEGEN_BACKENDS: gcc
<<: *job-linux-4c

# This job tests features we want to stabilize soon, to ensure they don't
# regress.
- name: x86_64-gnu-next-trait-solver-polonius
Expand Down Expand Up @@ -720,6 +720,7 @@ auto:
--target=i686-pc-windows-msvc
--enable-full-tools
--enable-profiler
--disable-docs
SCRIPT: python x.py dist bootstrap --include-default-paths
DIST_REQUIRE_ALL_TOOLS: 1
CODEGEN_BACKENDS: llvm,cranelift
Expand Down
1 change: 1 addition & 0 deletions src/tools/build-manifest/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ static DOCS_FALLBACK: &[(&str, &str)] = &[
("-apple-", "aarch64-apple-darwin"),
("aarch64", "aarch64-unknown-linux-gnu"),
("arm-", "aarch64-unknown-linux-gnu"),
("i686-pc-windows", "x86_64-pc-windows-msvc"),
("", "x86_64-unknown-linux-gnu"),
];

Expand Down
Loading