Skip to content

Commit fc6d59d

Browse files
committed
Make RUN_CHECK_WITH_PARALLEL_QUERIES the last thing to run
This takes a long time and rarely fails. It also interferes with `retry make prepare`, the retry is unhelpful since `make prepare` turns into a no-op
1 parent c99f1b7 commit fc6d59d

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/ci/run.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,6 @@ trap datecheck EXIT
157157
# sccache server at the start of the build, but no need to worry if this fails.
158158
SCCACHE_IDLE_TIMEOUT=10800 sccache --start-server || true
159159

160-
if [ "$RUN_CHECK_WITH_PARALLEL_QUERIES" != "" ]; then
161-
$SRC/configure --set rust.parallel-compiler
162-
CARGO_INCREMENTAL=0 $PYTHON ../x.py check
163-
rm -f config.toml
164-
rm -rf build
165-
fi
166-
167160
$SRC/configure $RUST_CONFIGURE_ARGS
168161

169162
retry make prepare
@@ -193,4 +186,11 @@ else
193186
do_make "$RUST_CHECK_TARGET"
194187
fi
195188

189+
if [ "$RUN_CHECK_WITH_PARALLEL_QUERIES" != "" ]; then
190+
rm -f config.toml
191+
rm -rf build
192+
$SRC/configure --set rust.parallel-compiler
193+
CARGO_INCREMENTAL=0 $PYTHON ../x.py check
194+
fi
195+
196196
sccache --show-stats || true

0 commit comments

Comments
 (0)