File tree 2 files changed +6
-0
lines changed
2 files changed +6
-0
lines changed Original file line number Diff line number Diff line change @@ -343,6 +343,7 @@ docker \
343
343
--env PR_CI_JOB \
344
344
--env OBJDIR_ON_HOST=" $objdir " \
345
345
--env CODEGEN_BACKENDS \
346
+ --env DISABLE_CI_RUSTC_IF_INCOMPATIBLE=" $DISABLE_CI_RUSTC_IF_INCOMPATIBLE " \
346
347
--init \
347
348
--rm \
348
349
rust-ci \
Original file line number Diff line number Diff line change @@ -52,6 +52,11 @@ if [ "$CI" != "" ]; then
52
52
RUST_CONFIGURE_ARGS=" $RUST_CONFIGURE_ARGS --set change-id=99999999"
53
53
fi
54
54
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
+
55
60
if ! isCI || isCiBranch auto || isCiBranch beta || isCiBranch try || isCiBranch try-perf || \
56
61
isCiBranch automation/bors/try; then
57
62
RUST_CONFIGURE_ARGS=" $RUST_CONFIGURE_ARGS --set build.print-step-timings --enable-verbose-tests"
You can’t perform that action at this time.
0 commit comments