diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2019-05-30 07:22:53 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2019-05-30 07:28:56 -0700 |
| commit | ebdf42e9650a969bef553a0886d3754a670bd335 (patch) | |
| tree | b9e344b322eeac983f8cad76a9643e7e5c155ed4 /src/ci | |
| parent | 19e0ddbb9f29c27f907fd0d23b70fbd53aeb6efb (diff) | |
| download | rust-ebdf42e9650a969bef553a0886d3754a670bd335.tar.gz rust-ebdf42e9650a969bef553a0886d3754a670bd335.zip | |
ci: Favor SCRIPT instead of RUST_CHECK_TARGET
Since #61212 we've been timing out on OSX, and this looks to be because we're building tools like Cargo and the RLS twice instead of once. This turns out to be a slight bug in our configuration. CI builders using the `RUST_CHECK_TARGET` directive actually execute `make all` just before their acual target. In `make all` we're building a stage2 cargo, and then in `make dist` we're building a stage1 cargo. Other builders use `SCRIPT` which provides explicit control over what `x.py` script, for example, is used to execute the build. This moves almost all targets to using `SCRIPT` to ensure that we're explicitly specifying what's being built where. Additionally this updates the logic of `RUST_CHECK_TARGET` to remove the pre-flight tidy as well as the pre-flight `make all`. The system LLVM builder (run on PRs) now explicitly runs tidy first and then runs the rest of the test suite.
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/i686-gnu-nopt/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-gnu-nopt/Dockerfile | 2 | ||||
| -rwxr-xr-x | src/ci/run.sh | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/src/ci/docker/i686-gnu-nopt/Dockerfile b/src/ci/docker/i686-gnu-nopt/Dockerfile index 5a83bd318c4..2041ba50bc9 100644 --- a/src/ci/docker/i686-gnu-nopt/Dockerfile +++ b/src/ci/docker/i686-gnu-nopt/Dockerfile @@ -18,4 +18,4 @@ COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu --disable-optimize-tests -ENV RUST_CHECK_TARGET check +ENV SCRIPT python2.7 ../x.py test diff --git a/src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile b/src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile index 160b23e0b00..2932f373737 100644 --- a/src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile +++ b/src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile @@ -24,4 +24,4 @@ ENV RUST_CONFIGURE_ARGS \ --build=x86_64-unknown-linux-gnu \ --llvm-root=/usr/lib/llvm-6.0 \ --enable-llvm-link-shared -ENV RUST_CHECK_TARGET check +ENV SCRIPT python2.7 ../x.py test src/tools/tidy && python2.7 ../x.py test diff --git a/src/ci/docker/x86_64-gnu-nopt/Dockerfile b/src/ci/docker/x86_64-gnu-nopt/Dockerfile index b0780fdf32a..d0b244c9b76 100644 --- a/src/ci/docker/x86_64-gnu-nopt/Dockerfile +++ b/src/ci/docker/x86_64-gnu-nopt/Dockerfile @@ -19,4 +19,4 @@ RUN sh /scripts/sccache.sh ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu \ --disable-optimize-tests \ --set rust.test-compare-mode -ENV RUST_CHECK_TARGET check +ENV SCRIPT python2.7 ../x.py test diff --git a/src/ci/run.sh b/src/ci/run.sh index 8ead6e0e4bd..811d401a83c 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -137,8 +137,6 @@ else return $retval } - do_make tidy - do_make all do_make "$RUST_CHECK_TARGET" fi |