Skip to content

Commit

Permalink
Auto merge of #132852 - RalfJung:rustc-if-unchanged, r=onur-ozkan
Browse files Browse the repository at this point in the history
do not trust download-rustc=if-unchanged on CI for now

See #131658.

Once #131831 lands this will be unnecessary, for until then, better safe than sorry.

r? `@onur-ozkan`
Cc `@rust-lang/bootstrap`
  • Loading branch information
bors committed Nov 10, 2024
2 parents c22887b + 5c9cc0c commit f5b6257
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 3 additions & 1 deletion src/ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions tests/run-make/version-verbose-commit-hash/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down

0 comments on commit f5b6257

Please sign in to comment.