diff options
| author | Hideki Sekine <sekineh@me.com> | 2018-07-18 18:14:47 +0900 |
|---|---|---|
| committer | Hideki Sekine <sekineh@me.com> | 2018-07-18 18:14:47 +0900 |
| commit | 0b3b8bf15c9f6be35c2f7cf1f282d81859dd05d2 (patch) | |
| tree | 63ac63c0d28945842eb701f50d39fa2ae19f56fd /src/ci | |
| parent | 355b99f954b743a89ab3d2fa22e7a09e82ebfe72 (diff) | |
| download | rust-0b3b8bf15c9f6be35c2f7cf1f282d81859dd05d2.tar.gz rust-0b3b8bf15c9f6be35c2f7cf1f282d81859dd05d2.zip | |
Use `dist-various-1` Dockerfile.
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/dist-various-1/Dockerfile | 9 | ||||
| -rw-r--r-- | src/ci/docker/thumb-none/Dockerfile | 34 |
2 files changed, 8 insertions, 35 deletions
diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile index b195decfcf5..e57209b9c65 100644 --- a/src/ci/docker/dist-various-1/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile @@ -80,6 +80,11 @@ RUN \ echo "# a" >> /usr/local/mips-linux-musl/bin/mips-openwrt-linux-musl-wrapper.sh && \ echo "# b" >> /usr/local/mipsel-linux-musl/bin/mipsel-openwrt-linux-musl-wrapper.sh +# ENV RUN_MAKE_TARGETS=thumbv6m-none-eabi +ENV RUN_MAKE_TARGETS=thumbv7m-none-eabi +ENV RUN_MAKE_TARGETS=$RUN_MAKE_TARGETS,thumbv7em-none-eabi +ENV RUN_MAKE_TARGETS=$RUN_MAKE_TARGETS,thumbv7em-none-eabihf + ENV TARGETS=asmjs-unknown-emscripten ENV TARGETS=$TARGETS,wasm32-unknown-emscripten ENV TARGETS=$TARGETS,x86_64-rumprun-netbsd @@ -120,7 +125,9 @@ ENV RUST_CONFIGURE_ARGS \ --enable-emscripten \ --disable-docs -ENV SCRIPT python2.7 ../x.py dist --target $TARGETS +ENV SCRIPT \ + python2.7 ../x.py test --target $RUN_MAKE_TARGETS src/test/run-make && \ + python2.7 ../x.py dist --target $TARGETS # sccache COPY scripts/sccache.sh /scripts/ diff --git a/src/ci/docker/thumb-none/Dockerfile b/src/ci/docker/thumb-none/Dockerfile deleted file mode 100644 index 354c022305e..00000000000 --- a/src/ci/docker/thumb-none/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -FROM ubuntu:16.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - g++ \ - make \ - file \ - curl \ - ca-certificates \ - python2.7 \ - git \ - cmake \ - sudo \ - xz-utils \ - zlib1g-dev \ - bzip2 \ - patch \ - libssl-dev \ - pkg-config \ - gcc-arm-none-eabi \ - libnewlib-arm-none-eabi - -# ENV TARGETS=thumbv6m-none-eabi -ENV TARGETS=thumbv7m-none-eabi -ENV TARGETS=$TARGETS,thumbv7em-none-eabi -ENV TARGETS=$TARGETS,thumbv7em-none-eabihf - -ENV RUST_CONFIGURE_ARGS \ - --disable-docs - -ENV SCRIPT python2.7 ../x.py test --target $TARGETS src/test/run-make - -# sccache -COPY scripts/sccache.sh /scripts/ -RUN sh /scripts/sccache.sh |