diff options
| author | bors <bors@rust-lang.org> | 2019-12-10 16:50:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-10 16:50:45 +0000 |
| commit | 7dbfb0a8ca4ab74ee3111e57a024f9e6257ce37c (patch) | |
| tree | f92b20477121841db7a87c9537a73bc0b7526544 /src/ci/docker/x86_64-gnu-tools/Dockerfile | |
| parent | 8960acf023d6739a601ae83cfc3d4ac30a85893e (diff) | |
| parent | 97d936423c914c4e3402bfecfd6943e1edf23815 (diff) | |
Auto merge of #66681 - Mark-Simulacrum:toolstate-into-bootstrap, r=pietroalbini
Move toolstate checking into bootstrap This intends no functional changes, merely translates the spread of shell/python into Rust. One problematic area that I'd like to avoid but wasn't quite able to figure out how is the master branch script which is still in bash/python -- I cared less about that since it is orthogonal to the actual checking that we're doing, though as-is we're duplicating some code across Rust and that script. r? @kennytm or maybe @pietroalbini
Diffstat (limited to 'src/ci/docker/x86_64-gnu-tools/Dockerfile')
| -rw-r--r-- | src/ci/docker/x86_64-gnu-tools/Dockerfile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/ci/docker/x86_64-gnu-tools/Dockerfile b/src/ci/docker/x86_64-gnu-tools/Dockerfile index 7687a6ca23e..51193402ee8 100644 --- a/src/ci/docker/x86_64-gnu-tools/Dockerfile +++ b/src/ci/docker/x86_64-gnu-tools/Dockerfile @@ -17,9 +17,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh -COPY x86_64-gnu-tools/checkregression.py /tmp/ COPY x86_64-gnu-tools/checktools.sh /tmp/ -COPY x86_64-gnu-tools/repo.sh /tmp/ # Run rustbook with `linkcheck` feature enabled ENV CHECK_LINKS 1 @@ -27,4 +25,4 @@ ENV CHECK_LINKS 1 ENV RUST_CONFIGURE_ARGS \ --build=x86_64-unknown-linux-gnu \ --save-toolstates=/tmp/toolstate/toolstates.json -ENV SCRIPT /tmp/checktools.sh ../x.py /tmp/toolstate/toolstates.json linux +ENV SCRIPT /tmp/checktools.sh ../x.py |