From 58eeeb42089a98925b04d9ceb7dbf2c93cc29d45 Mon Sep 17 00:00:00 2001 From: Michael Woerister Date: Fri, 4 May 2018 06:30:17 +0200 Subject: [PATCH] Check that rustc can be built successfully with parallel queries for PRs. --- src/ci/docker/mingw-check/Dockerfile | 1 + src/ci/docker/x86_64-gnu-debug/Dockerfile | 2 +- src/ci/run.sh | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ci/docker/mingw-check/Dockerfile b/src/ci/docker/mingw-check/Dockerfile index ae4641009cf1d..aab339f399c59 100644 --- a/src/ci/docker/mingw-check/Dockerfile +++ b/src/ci/docker/mingw-check/Dockerfile @@ -19,4 +19,5 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh +ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1 ENV SCRIPT python2.7 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu diff --git a/src/ci/docker/x86_64-gnu-debug/Dockerfile b/src/ci/docker/x86_64-gnu-debug/Dockerfile index ff6ab1013b4c2..bdde7ad7fe854 100644 --- a/src/ci/docker/x86_64-gnu-debug/Dockerfile +++ b/src/ci/docker/x86_64-gnu-debug/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh -ENV PARALLEL_CHECK 1 +ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1 ENV RUST_CONFIGURE_ARGS \ --build=x86_64-unknown-linux-gnu \ --enable-debug \ diff --git a/src/ci/run.sh b/src/ci/run.sh index 119b239d6b290..456f8cc7317e7 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -78,9 +78,9 @@ fi # 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 [ "$PARALLEL_CHECK" != "" ]; then +if [ "$RUN_CHECK_WITH_PARALLEL_QUERIES" != "" ]; then $SRC/configure --enable-experimental-parallel-queries - python2.7 ../x.py check + CARGO_INCREMENTAL=0 python2.7 ../x.py check rm -f config.toml rm -rf build fi