Skip to content

Commit 537f0d5

Browse files
committed
Rollup merge of rust-lang#49120 - Zoxc:parallel-ci, r=alexcrichton
Add a CI job for parallel rustc using x.py check r? @alexcrichton
2 parents e551f24 + efa9016 commit 537f0d5

File tree

4 files changed

+12
-0
lines changed

4 files changed

+12
-0
lines changed

Diff for: config.toml.example

+3
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,9 @@
271271
# Whether or not `panic!`s generate backtraces (RUST_BACKTRACE)
272272
#backtrace = true
273273

274+
# Build rustc with experimental parallelization
275+
#experimental-parallel-queries = false
276+
274277
# The default linker that will be hard-coded into the generated compiler for
275278
# targets that don't specify linker explicitly in their target specifications.
276279
# Note that this is not the linker used to link said compiler.

Diff for: src/bootstrap/configure.py

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ def v(*args):
4444
o("docs", "build.docs", "build standard library documentation")
4545
o("compiler-docs", "build.compiler-docs", "build compiler documentation")
4646
o("optimize-tests", "rust.optimize-tests", "build tests with optimizations")
47+
o("experimental-parallel-queries", "rust.experimental-parallel-queries", "build rustc with experimental parallelization")
4748
o("test-miri", "rust.test-miri", "run miri's test suite")
4849
o("debuginfo-tests", "rust.debuginfo-tests", "build tests with debugger metadata")
4950
o("quiet-tests", "rust.quiet-tests", "enable quieter output when running tests")

Diff for: src/ci/docker/x86_64-gnu-debug/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +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
1920
ENV RUST_CONFIGURE_ARGS \
2021
--build=x86_64-unknown-linux-gnu \
2122
--enable-debug \

Diff for: src/ci/run.sh

+7
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,13 @@ fi
7474
# sccache server at the start of the build, but no need to worry if this fails.
7575
SCCACHE_IDLE_TIMEOUT=10800 sccache --start-server || true
7676

77+
if [ "$PARALLEL_CHECK" != "" ]; then
78+
$SRC/configure --enable-experimental-parallel-queries
79+
python2.7 ../x.py check
80+
rm -f config.toml
81+
rm -rf build
82+
fi
83+
7784
travis_fold start configure
7885
travis_time_start
7986
$SRC/configure $RUST_CONFIGURE_ARGS

0 commit comments

Comments
 (0)