From b3c212103b826cde383093fab2f4237bb5736923 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 10 Nov 2024 14:47:16 +0100 Subject: [PATCH 1/2] do not trust download-rustc=if-unchanged on CI for now --- src/ci/run.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ci/run.sh b/src/ci/run.sh index 8e2f525db68..9f39ad9c55c 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -179,7 +179,9 @@ else fi if [ "$NO_DOWNLOAD_CI_RUSTC" = "" ]; then - RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.download-rustc=if-unchanged" + # disabled for now, see https://github.com/rust-lang/rust/issues/131658 + #RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.download-rustc=if-unchanged" + true fi fi From 5c9cc0cfbb11a97d084e5a09bb47cc5566421460 Mon Sep 17 00:00:00 2001 From: Jieyou Xu Date: Sun, 10 Nov 2024 20:50:15 +0800 Subject: [PATCH 2/2] Re-enable `version-verbose-commit-hash` run-make test --- tests/run-make/version-verbose-commit-hash/rmake.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/run-make/version-verbose-commit-hash/rmake.rs b/tests/run-make/version-verbose-commit-hash/rmake.rs index 6e88193280f..733c0e2cdb1 100644 --- a/tests/run-make/version-verbose-commit-hash/rmake.rs +++ b/tests/run-make/version-verbose-commit-hash/rmake.rs @@ -3,9 +3,6 @@ // test ensures it will not be broken again. // See https://github.com/rust-lang/rust/issues/107094 -// FIXME(#132845): temporarily disabled to get revert through -//@ ignore-test - //@ needs-git-hash use run_make_support::{bare_rustc, bare_rustdoc, regex};