mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #132852 - RalfJung:rustc-if-unchanged, r=onur-ozkan

Browse Source 
do not trust download-rustc=if-unchanged on CI for now

See https://github.com/rust-lang/rust/issues/131658.

Once https://github.com/rust-lang/rust/pull/131831 lands this will be unnecessary, for until then, better safe than sorry.

r? `@onur-ozkan`
Cc `@rust-lang/bootstrap`
This commit is contained in:
bors 2024-11-10 15:30:33 +00:00
commit f5b62577f7
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ci/run.sh
View File

@ -179,7 +179,9 @@ else
fi fi
if [ "$NO_DOWNLOAD_CI_RUSTC" = "" ]; then 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
fi fi

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

@ -3,9 +3,6 @@
// test ensures it will not be broken again. // test ensures it will not be broken again.
// See https://github.com/rust-lang/rust/issues/107094 // See https://github.com/rust-lang/rust/issues/107094
// FIXME(#132845): temporarily disabled to get revert through
//@ ignore-test
//@ needs-git-hash //@ needs-git-hash
use run_make_support::{bare_rustc, bare_rustdoc, regex}; use run_make_support::{bare_rustc, bare_rustdoc, regex};