merge dist-various-3 into dist-various-1

.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

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

src/ci/docker/dist-various-3/Dockerfile

@@ -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