Skip to content

Commit f5b6257

Browse files
committed
Auto merge of rust-lang#132852 - RalfJung:rustc-if-unchanged, r=onur-ozkan
do not trust download-rustc=if-unchanged on CI for now See rust-lang#131658. Once rust-lang#131831 lands this will be unnecessary, for until then, better safe than sorry. r? `@onur-ozkan` Cc `@rust-lang/bootstrap`
2 parents c22887b + 5c9cc0c commit f5b6257

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/ci/run.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,9 @@ else
179179
fi
180180

181181
if [ "$NO_DOWNLOAD_CI_RUSTC" = "" ]; then
182-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.download-rustc=if-unchanged"
182+
# disabled for now, see https://github.com/rust-lang/rust/issues/131658
183+
#RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.download-rustc=if-unchanged"
184+
true
183185
fi
184186
fi
185187

tests/run-make/version-verbose-commit-hash/rmake.rs

-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
// test ensures it will not be broken again.
44
// See https://github.com/rust-lang/rust/issues/107094
55

6-
// FIXME(#132845): temporarily disabled to get revert through
7-
//@ ignore-test
8-
96
//@ needs-git-hash
107

118
use run_make_support::{bare_rustc, bare_rustdoc, regex};

0 commit comments

Comments
 (0)