Skip to content

Commit

Permalink
Make RUN_CHECK_WITH_PARALLEL_QUERIES the last thing to run
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jyn514 committed Dec 14, 2022
1 parent c99f1b7 commit fc6d59d
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,6 @@ trap datecheck EXIT
# sccache server at the start of the build, but no need to worry if this fails.
SCCACHE_IDLE_TIMEOUT=10800 sccache --start-server || true

if [ "$RUN_CHECK_WITH_PARALLEL_QUERIES" != "" ]; then
$SRC/configure --set rust.parallel-compiler
CARGO_INCREMENTAL=0 $PYTHON ../x.py check
rm -f config.toml
rm -rf build
fi

$SRC/configure $RUST_CONFIGURE_ARGS

retry make prepare
Expand Down Expand Up @@ -193,4 +186,11 @@ else
do_make "$RUST_CHECK_TARGET"
fi

if [ "$RUN_CHECK_WITH_PARALLEL_QUERIES" != "" ]; then
rm -f config.toml
rm -rf build
$SRC/configure --set rust.parallel-compiler
CARGO_INCREMENTAL=0 $PYTHON ../x.py check
fi

sccache --show-stats || true

0 comments on commit fc6d59d

Please sign in to comment.