Skip to content

Commit f9bfe84

Browse files
committed
Auto merge of #50444 - michaelwoerister:check-parallel-queries-in-ci, r=alexcrichton
Add a CI job that makes sure rustc builds with parallel queries enabled. This shouldn't take up too much CI time `:)` cc #48607 cc @Zoxc r? @alexcrichton
2 parents 24c5f15 + 58eeeb4 commit f9bfe84

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/ci/docker/mingw-check/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1919
COPY scripts/sccache.sh /scripts/
2020
RUN sh /scripts/sccache.sh
2121

22+
ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
2223
ENV SCRIPT python2.7 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu

src/ci/docker/x86_64-gnu-debug/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1616
COPY scripts/sccache.sh /scripts/
1717
RUN sh /scripts/sccache.sh
1818

19-
ENV PARALLEL_CHECK 1
19+
ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
2020
ENV RUST_CONFIGURE_ARGS \
2121
--build=x86_64-unknown-linux-gnu \
2222
--enable-debug \

src/ci/run.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ fi
7878
# sccache server at the start of the build, but no need to worry if this fails.
7979
SCCACHE_IDLE_TIMEOUT=10800 sccache --start-server || true
8080

81-
if [ "$PARALLEL_CHECK" != "" ]; then
81+
if [ "$RUN_CHECK_WITH_PARALLEL_QUERIES" != "" ]; then
8282
$SRC/configure --enable-experimental-parallel-queries
83-
python2.7 ../x.py check
83+
CARGO_INCREMENTAL=0 python2.7 ../x.py check
8484
rm -f config.toml
8585
rm -rf build
8686
fi

0 commit comments

Comments
 (0)