mirror of
https://github.com/rust-lang/rust.git
synced 2025-02-19 02:13:57 +00:00
handle CI rustc incompatible runners
Signed-off-by: onur-ozkan <work@onurozkan.dev>
This commit is contained in:
parent
b0b4f4a1f3
commit
8a5f418f14
@ -343,6 +343,7 @@ docker \
|
||||
--env PR_CI_JOB \
|
||||
--env OBJDIR_ON_HOST="$objdir" \
|
||||
--env CODEGEN_BACKENDS \
|
||||
--env DISABLE_CI_RUSTC_IF_INCOMPATIBLE="$DISABLE_CI_RUSTC_IF_INCOMPATIBLE" \
|
||||
--init \
|
||||
--rm \
|
||||
rust-ci \
|
||||
|
@ -52,6 +52,11 @@ if [ "$CI" != "" ]; then
|
||||
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set change-id=99999999"
|
||||
fi
|
||||
|
||||
# If runner uses an incompatible option and `FORCE_CI_RUSTC` is not defined, switch to in-tree rustc.
|
||||
if [ "$FORCE_CI_RUSTC" == "" ]; then
|
||||
DISABLE_CI_RUSTC_IF_INCOMPATIBLE=1
|
||||
fi
|
||||
|
||||
if ! isCI || isCiBranch auto || isCiBranch beta || isCiBranch try || isCiBranch try-perf || \
|
||||
isCiBranch automation/bors/try; then
|
||||
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.print-step-timings --enable-verbose-tests"
|
||||
|
Loading…
Reference in New Issue
Block a user