Commit 8e25b4121d5ea29bef166b86173fb043782ffbff | rust

Workaround: Skip rustc book on i686



Workaround for https://github.com/rust-lang/rust/issues/158378 so we can get CI going again

r? @ghost

4 files changed, 12 insertions(+), 3 deletions(-)

src/bootstrap/mk/Makefile.in+2-2

...	...	@@ -112,9 +112,9 @@ TEST_SET2 := --skip=tests --skip=coverage-map --skip=coverage-run --skip=library
112	112
113	113	# this intentionally doesn't use `$(BOOTSTRAP)` so we can test the shebang on Windows
114	114	ci-msvc-py:
115		$(Q)$(CFG_SRC_DIR)/x.py test --stage 2 $(TEST_SET1)
	115	$(Q)$(CFG_SRC_DIR)/x.py test --stage 2 $(TEST_SET1) --skip=src/tools/linkchecker
116	116	ci-msvc-ps1:
117		$(Q)$(CFG_SRC_DIR)/x.ps1 test --stage 2 $(TEST_SET2)
	117	$(Q)$(CFG_SRC_DIR)/x.ps1 test --stage 2 $(TEST_SET2) --skip=src/tools/linkchecker
118	118	ci-msvc: ci-msvc-py ci-msvc-ps1
119	119
120	120	## MingW native builders

src/bootstrap/src/core/build_steps/doc.rs+7

...	...	@@ -1392,6 +1392,13 @@ impl Step for RustcBook {
1392	1392	/// in the "md-doc" directory in the build output directory. Then
1393	1393	/// "rustbook" is used to convert it to HTML.
1394	1394	fn run(self, builder: &Builder<'_>) {
	1395	// FIXME: Temporary workaround for https://github.com/rust-lang/rust/issues/158378
	1396	#[cfg(not(test))] // So this check doesn't affect the bootstrap tests
	1397	if self.target == "i686-pc-windows-msvc" {
	1398	eprintln!("WARNING: Skipping rustc book build to work around #158378");
	1399	return;
	1400	}
	1401
1395	1402	let out_base = builder.md_doc_out(self.target).join("rustc");
1396	1403	t!(fs::create_dir_all(&out_base));
1397	1404	let out_listing = out_base.join("src/lints");

src/ci/github-actions/jobs.yml+2-1

...	...	@@ -161,7 +161,7 @@ pr:
161	161	env:
162	162	CODEGEN_BACKENDS: gcc
163	163	<<: *job-linux-4c
164
	164
165	165	# This job tests features we want to stabilize soon, to ensure they don't
166	166	# regress.
167	167	- name: x86_64-gnu-next-trait-solver-polonius
...	...	@@ -720,6 +720,7 @@ auto:
720	720	--target=i686-pc-windows-msvc
721	721	--enable-full-tools
722	722	--enable-profiler
	723	--disable-docs
723	724	SCRIPT: python x.py dist bootstrap --include-default-paths
724	725	DIST_REQUIRE_ALL_TOOLS: 1
725	726	CODEGEN_BACKENDS: llvm,cranelift

src/tools/build-manifest/src/main.rs+1

...	...	@@ -26,6 +26,7 @@ static DOCS_FALLBACK: &[(&str, &str)] = &[
26	26	("-apple-", "aarch64-apple-darwin"),
27	27	("aarch64", "aarch64-unknown-linux-gnu"),
28	28	("arm-", "aarch64-unknown-linux-gnu"),
	29	("i686-pc-windows", "x86_64-pc-windows-msvc"),
29	30	("", "x86_64-unknown-linux-gnu"),
30	31	];
31	32