Skip to content

Commit d069354

Browse files
committed
merge dist-various-3 into dist-various-1
1 parent 2a99c02 commit d069354

File tree

3 files changed

+7
-22
lines changed

3 files changed

+7
-22
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,6 @@ matrix:
116116
if: branch = auto
117117
- env: IMAGE=dist-various-2 DEPLOY=1
118118
if: branch = auto
119-
- env: IMAGE=dist-various-3 DEPLOY=1
120-
if: branch = auto
121119
- env: IMAGE=dist-aarch64-linux DEPLOY=1
122120
if: branch = auto
123121
- env: IMAGE=dist-android DEPLOY=1

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2020
bzip2 \
2121
patch \
2222
libssl-dev \
23-
pkg-config
23+
pkg-config \
24+
gcc-arm-none-eabi \
25+
libnewlib-arm-none-eabi
2426

2527
WORKDIR /build
2628

@@ -78,6 +80,10 @@ ENV TARGETS=$TARGETS,armv7-unknown-linux-musleabihf
7880
ENV TARGETS=$TARGETS,aarch64-unknown-linux-musl
7981
ENV TARGETS=$TARGETS,sparc64-unknown-linux-gnu
8082
ENV TARGETS=$TARGETS,x86_64-unknown-redox
83+
ENV TARGETS=$TARGETS,thumbv6m-none-eabi
84+
ENV TARGETS=$TARGETS,thumbv7m-none-eabi
85+
ENV TARGETS=$TARGETS,thumbv7em-none-eabi
86+
ENV TARGETS=$TARGETS,thumbv7em-none-eabihf
8187

8288
# FIXME: remove armv5te vars after https://github.com/alexcrichton/cc-rs/issues/271
8389
# get fixed and cc update

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

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

0 commit comments

Comments
 (0)