Skip to content

Commit 8a5f418

Browse files
committed
handle CI rustc incompatible runners
Signed-off-by: onur-ozkan <[email protected]>
1 parent b0b4f4a commit 8a5f418

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

src/ci/docker/run.sh

+1
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ docker \
343343
--env PR_CI_JOB \
344344
--env OBJDIR_ON_HOST="$objdir" \
345345
--env CODEGEN_BACKENDS \
346+
--env DISABLE_CI_RUSTC_IF_INCOMPATIBLE="$DISABLE_CI_RUSTC_IF_INCOMPATIBLE" \
346347
--init \
347348
--rm \
348349
rust-ci \

src/ci/run.sh

+5
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ if [ "$CI" != "" ]; then
5252
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set change-id=99999999"
5353
fi
5454

55+
# If runner uses an incompatible option and `FORCE_CI_RUSTC` is not defined, switch to in-tree rustc.
56+
if [ "$FORCE_CI_RUSTC" == "" ]; then
57+
DISABLE_CI_RUSTC_IF_INCOMPATIBLE=1
58+
fi
59+
5560
if ! isCI || isCiBranch auto || isCiBranch beta || isCiBranch try || isCiBranch try-perf || \
5661
isCiBranch automation/bors/try; then
5762
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.print-step-timings --enable-verbose-tests"

0 commit comments

Comments
 (0)