Skip to content

Commit 0b3b8bf

Browse files
committed
Use dist-various-1 Dockerfile.
1 parent 355b99f commit 0b3b8bf

File tree

3 files changed

+8
-37
lines changed

3 files changed

+8
-37
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,6 @@ matrix:
162162
if: branch = auto
163163
- env: IMAGE=wasm32-unknown
164164
if: branch = auto
165-
- env: IMAGE=thumb-none
166-
if: branch = auto
167165
- env: IMAGE=x86_64-gnu
168166
if: branch = auto
169167
- env: IMAGE=x86_64-gnu-full-bootstrap

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ RUN \
8080
echo "# a" >> /usr/local/mips-linux-musl/bin/mips-openwrt-linux-musl-wrapper.sh && \
8181
echo "# b" >> /usr/local/mipsel-linux-musl/bin/mipsel-openwrt-linux-musl-wrapper.sh
8282

83+
# ENV RUN_MAKE_TARGETS=thumbv6m-none-eabi
84+
ENV RUN_MAKE_TARGETS=thumbv7m-none-eabi
85+
ENV RUN_MAKE_TARGETS=$RUN_MAKE_TARGETS,thumbv7em-none-eabi
86+
ENV RUN_MAKE_TARGETS=$RUN_MAKE_TARGETS,thumbv7em-none-eabihf
87+
8388
ENV TARGETS=asmjs-unknown-emscripten
8489
ENV TARGETS=$TARGETS,wasm32-unknown-emscripten
8590
ENV TARGETS=$TARGETS,x86_64-rumprun-netbsd
@@ -120,7 +125,9 @@ ENV RUST_CONFIGURE_ARGS \
120125
--enable-emscripten \
121126
--disable-docs
122127

123-
ENV SCRIPT python2.7 ../x.py dist --target $TARGETS
128+
ENV SCRIPT \
129+
python2.7 ../x.py test --target $RUN_MAKE_TARGETS src/test/run-make && \
130+
python2.7 ../x.py dist --target $TARGETS
124131

125132
# sccache
126133
COPY scripts/sccache.sh /scripts/

src/ci/docker/thumb-none/Dockerfile

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)