diff options
| author | bors <bors@rust-lang.org> | 2018-05-05 21:09:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-05-05 21:09:56 +0000 |
| commit | f9bfe840f41d00e9712f13fbc635ec3fbe95e8c4 (patch) | |
| tree | b30d76066d5b589cd0ed0a4fd227f9ee7e767578 | |
| parent | 24c5f153fd23987a0d7a78cbf54ebc94b3fd7855 (diff) | |
| parent | 58eeeb42089a98925b04d9ceb7dbf2c93cc29d45 (diff) | |
| download | rust-f9bfe840f41d00e9712f13fbc635ec3fbe95e8c4.tar.gz rust-f9bfe840f41d00e9712f13fbc635ec3fbe95e8c4.zip | |
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 https://github.com/rust-lang/rust/issues/48607 cc @Zoxc r? @alexcrichton
| -rw-r--r-- | src/ci/docker/mingw-check/Dockerfile | 1 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-gnu-debug/Dockerfile | 2 | ||||
| -rwxr-xr-x | 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 ae4641009cf..aab339f399c 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 ff6ab1013b4..bdde7ad7fe8 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 119b239d6b2..456f8cc7317 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 |