diff options
| author | Jorge Aparicio <jorge@japaric.io> | 2018-04-03 08:26:24 +0200 |
|---|---|---|
| committer | Jorge Aparicio <jorge@japaric.io> | 2018-04-03 08:26:24 +0200 |
| commit | d0693548cdb4fe9e380f7c607c53a2e16821ebc2 (patch) | |
| tree | 12bfae0627cc60b38485ed43c2932d387685d631 | |
| parent | 2a99c027eb95c471daf50815ec30504c42179300 (diff) | |
| download | rust-d0693548cdb4fe9e380f7c607c53a2e16821ebc2.tar.gz rust-d0693548cdb4fe9e380f7c607c53a2e16821ebc2.zip | |
merge dist-various-3 into dist-various-1
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | src/ci/docker/dist-various-1/Dockerfile | 8 | ||||
| -rw-r--r-- | src/ci/docker/dist-various-3/Dockerfile | 19 |
3 files changed, 7 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml index a67c6c79bbd..091a5abdaa2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -116,8 +116,6 @@ matrix: if: branch = auto - env: IMAGE=dist-various-2 DEPLOY=1 if: branch = auto - - env: IMAGE=dist-various-3 DEPLOY=1 - if: branch = auto - env: IMAGE=dist-aarch64-linux DEPLOY=1 if: branch = auto - env: IMAGE=dist-android DEPLOY=1 diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile index b398e9a3c92..e61757ff5ee 100644 --- a/src/ci/docker/dist-various-1/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile @@ -20,7 +20,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ bzip2 \ patch \ libssl-dev \ - pkg-config + pkg-config \ + gcc-arm-none-eabi \ + libnewlib-arm-none-eabi WORKDIR /build @@ -78,6 +80,10 @@ ENV TARGETS=$TARGETS,armv7-unknown-linux-musleabihf ENV TARGETS=$TARGETS,aarch64-unknown-linux-musl ENV TARGETS=$TARGETS,sparc64-unknown-linux-gnu ENV TARGETS=$TARGETS,x86_64-unknown-redox +ENV TARGETS=$TARGETS,thumbv6m-none-eabi +ENV TARGETS=$TARGETS,thumbv7m-none-eabi +ENV TARGETS=$TARGETS,thumbv7em-none-eabi +ENV TARGETS=$TARGETS,thumbv7em-none-eabihf # FIXME: remove armv5te vars after https://github.com/alexcrichton/cc-rs/issues/271 # get fixed and cc update diff --git a/src/ci/docker/dist-various-3/Dockerfile b/src/ci/docker/dist-various-3/Dockerfile deleted file mode 100644 index 06c80982f3c..00000000000 --- a/src/ci/docker/dist-various-3/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM ubuntu:17.10 - -COPY scripts/cross-apt-packages.sh /scripts/ -RUN sh /scripts/cross-apt-packages.sh - -RUN apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends \ - gcc-arm-none-eabi \ - libnewlib-arm-none-eabi - -COPY scripts/sccache.sh /scripts/ -RUN sh /scripts/sccache.sh - -ENV TARGETS=thumbv6m-none-eabi -ENV TARGETS=$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 dist --target $TARGETS |