Skip to content

Commit 3e6115d

Browse files
alexcrichtonalexcrichton
committed
test
1 parent c4e3f6b commit 3e6115d

File tree

8 files changed

+123
-68
lines changed

8 files changed

+123
-68
lines changed

‎.travis.yml

Lines changed: 9 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -80,88 +80,31 @@ matrix:
8080

8181
# Cross compile Android targets from linux
8282
- env: TARGET=arm-linux-androideabi
83-
script: &dinghy-build
84-
- rustup target add $TARGET
85-
- cargo dinghy --platform $PLATFORM test --no-run
8683
- env: TARGET=armv7-linux-androideabi
87-
script: *dinghy-build
8884
- env: TARGET=aarch64-linux-android
89-
script: *dinghy-build
9085
- env: TARGET=i686-linux-android
91-
script: *dinghy-build
9286
- env: TARGET=x86_64-linux-android
93-
script: *dinghy-build
9487

9588
# Build iOS targets from OSX
96-
- env: TARGET=aarch64-apple-ios
89+
- env: TARGET=aarch64-apple-ios PLATFORM=ios-aarch64
9790
os: osx
98-
script: *dinghy-build
99-
- env: TARGET=armv7-apple-ios
91+
script: &dinghy-build
92+
- cargo install cargo-dinghy --debug
93+
- rustup target add $TARGET
94+
- cargo dinghy --platform $PLATFORM test --no-run
95+
- env: TARGET=armv7-apple-ios PLATFORM=ios-armv7
10096
os: osx
10197
script: *dinghy-build
102-
- env: TARGET=armv7s-apple-ios
98+
- env: TARGET=armv7s-apple-ios PLATFORM=ios-armv7s
10399
os: osx
104100
script: *dinghy-build
105-
- env: TARGET=i386-apple-ios
101+
- env: TARGET=i386-apple-ios PLATFORM=ios-i386
106102
os: osx
107103
script: *dinghy-build
108-
- env: TARGET=x86_64-apple-ios
104+
- env: TARGET=x86_64-apple-ios PLATFORM=ios-x86_64
109105
os: osx
110106
script: *dinghy-build
111107

112-
113-
install:
114-
- |
115-
case "$TARGET" in
116-
*android*)
117-
export ANDROID_HOME="$HOME/cached/android-sdk";
118-
mkdir -p $ANDROID_HOME
119-
[ -e "cached/android-sdk.zip" ] || curl -o cached/android-sdk.zip \
120-
"https://dl.google.com/android/repository/sdk-tools-${TRAVIS_OS_NAME}-${ANDROID_SDK_VERSION}.zip"
121-
[ -e $ANDROID_HOME/tools ] || unzip -q cached/android-sdk.zip -d $ANDROID_HOME
122-
123-
yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses > /dev/null
124-
125-
ANDROID_NDK=$ANDROID_HOME/ndk-bundle
126-
127-
[ -e $ANDROID_NDK ] || \
128-
$ANDROID_HOME/tools/bin/sdkmanager \
129-
'build-tools;27.0.0' 'platforms;android-27' 'ndk-bundle' \
130-
'platform-tools' > /dev/null
131-
132-
ARCH=`echo $TARGET | cut -f 1 -d '-'`
133-
134-
case $ARCH in
135-
arm) ANDROID_ARCH=arm;;
136-
armv7) ANDROID_ARCH=arm;;
137-
aarch64) ANDROID_ARCH=arm64;;
138-
i686) ANDROID_ARCH=x86;;
139-
x86_64) ANDROID_ARCH=x86_64;;
140-
esac
141-
142-
export TOOLCHAIN=$HOME/cached/android-$ANDROID_ARCH
143-
[ -e $TOOLCHAIN ] || \
144-
$ANDROID_NDK/build/tools/make_standalone_toolchain.py --arch $ANDROID_ARCH \
145-
--stl=libc++ --api 21 --install-dir $TOOLCHAIN
146-
147-
echo "[platforms.android-$ARCH]" > $HOME/.dinghy.toml
148-
echo "rustc_triple=\"$TARGET\"" >> $HOME/.dinghy.toml
149-
echo "toolchain=\"$TOOLCHAIN\"" >> $HOME/.dinghy.toml
150-
151-
PLATFORM=android-$ARCH
152-
;;
153-
*-apple-ios)
154-
ARCH=`echo $TARGET | cut -f 1 -d '-'`
155-
PLATFORM=ios-$ARCH
156-
;;
157-
*)
158-
esac
159-
160-
if [ -n "$PLATFORM" ]
161-
then
162-
which cargo-dinghy || cargo install cargo-dinghy
163-
fi
164-
165108
# non dinghy cross-compilation targets
166109
script:
167110
- if [ "$NO_ADD" == "" ]; then rustup target add $TARGET; fi
@@ -176,5 +119,4 @@ env:
176119
global:
177120
# serde-codegen has historically needed a large stack to expand
178121
- RUST_MIN_STACK=16777216
179-
- ANDROID_SDK_VERSION=4333796
180122
- secure: "Kuf3j6gC3MhR+F7g8/5J4+3tu+FXJP/SqKjsUVVjs/qjniIVX3MwZPhtP/pVtdRvYjW0NzLw5Nufb4o1cyY4uKwR8BHHNuEUE/h3mPShjWHqzLyn5QiBumPozsFCa32H4gconRmp3+s0YrBT7nLoGvUZZS0dkldMkpvvrPL/yUKXLS8HEP4L1GO5iMQQYG6i3sbWTbHikE6ZQogW/iZommyqUkVB/s/SQvdH9SXu89ttNXlm/F+EIsgsgyzpbULp5sD34GRDPJe+H1m+sgA1kTRrzmuBGNmz9mx6GyIKaqACTm1gRcb06nFjTPVTQioJBNnoV7TEqZCvjuSsUjcGmP4Aeissafo93ADzV+bd0uoWIScE9ltSVS+RgCDV+sd0GHz5U6FjhgZp0amaVl3d6hPp8lbTfK/gfj1i9ktQfKZbG7rB4tfIU1KeQRkyE9vb/TaKp8nwBbc4SVQ4EKFOlRbE1S1FooaKZweW8w57d2u+sMMMVJbO28/Ap8tk9xDSOl4shPaT0iM0U9/heF8FmCZB1OKXLKn6TAaNFnaMTvdTHl+Tjrf6Vzd/oPXJ7GuaB6eLxXYjXvZHuKiLkSZriOzhL7PbijNILbSgZt7+Fa0vcnXP8zgD4dmupx/CoIHLN9NP4o9cGXuBcaJ/iFryJ4i5LKGFNEUHtXkavDrcgcA="

‎ci/android-ndk.sh

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
set -ex
2+
3+
ANDROID_ARCH=$1
4+
ANDROID_SDK_VERSION=4333796
5+
6+
mkdir /tmp/android
7+
cd /tmp/android
8+
9+
curl -o android-sdk.zip \
10+
"https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_VERSION}.zip"
11+
unzip -q android-sdk.zip
12+
13+
yes | ./tools/bin/sdkmanager --licenses > /dev/null
14+
./tools/bin/sdkmanager ndk-bundle > /dev/null
15+
16+
./ndk-bundle/build/tools/make_standalone_toolchain.py \
17+
--arch $ANDROID_ARCH \
18+
--stl=libc++ \
19+
--api 21 \
20+
--install-dir /android-toolchain
21+
22+
cd /tmp
23+
rm -rf android

‎ci/docker/aarch64-linux-android/Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM ubuntu:18.04
2+
3+
RUN apt-get update && apt-get install -y --no-install-recommends \
4+
curl \
5+
ca-certificates \
6+
unzip \
7+
openjdk-8-jre \
8+
python \
9+
gcc \
10+
libc6-dev
11+
12+
COPY android-ndk.sh /
13+
RUN /android-ndk.sh arm64
14+
ENV PATH=$PATH:/android-toolchain/bin
15+
16+
# TODO: run tests in an emulator eventually
17+
ENV CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android-gcc \
18+
CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER="true"

‎ci/docker/arm-linux-androideabi/Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM ubuntu:18.04
2+
3+
RUN apt-get update && apt-get install -y --no-install-recommends \
4+
curl \
5+
ca-certificates \
6+
unzip \
7+
openjdk-8-jre \
8+
python \
9+
gcc \
10+
libc6-dev
11+
12+
COPY android-ndk.sh /
13+
RUN /android-ndk.sh arm
14+
ENV PATH=$PATH:/android-toolchain/bin
15+
16+
# TODO: run tests in an emulator eventually
17+
ENV CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
18+
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER="true"

‎ci/docker/armv7-linux-androideabi/Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM ubuntu:18.04
2+
3+
RUN apt-get update && apt-get install -y --no-install-recommends \
4+
curl \
5+
ca-certificates \
6+
unzip \
7+
openjdk-8-jre \
8+
python \
9+
gcc \
10+
libc6-dev
11+
12+
COPY android-ndk.sh /
13+
RUN /android-ndk.sh arm
14+
ENV PATH=$PATH:/android-toolchain/bin
15+
16+
# TODO: run tests in an emulator eventually
17+
ENV CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
18+
CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_RUNNER="true"

‎ci/docker/i686-linux-android/Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM ubuntu:18.04
2+
3+
RUN apt-get update && apt-get install -y --no-install-recommends \
4+
curl \
5+
ca-certificates \
6+
unzip \
7+
openjdk-8-jre \
8+
python \
9+
gcc \
10+
libc6-dev
11+
12+
COPY android-ndk.sh /
13+
RUN /android-ndk.sh x86
14+
ENV PATH=$PATH:/android-toolchain/bin
15+
16+
# TODO: run tests in an emulator eventually
17+
ENV CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-gcc \
18+
CARGO_TARGET_I686_LINUX_ANDROID_RUNNER="true"

‎ci/docker/x86_64-linux-android/Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM ubuntu:18.04
2+
3+
RUN apt-get update && apt-get install -y --no-install-recommends \
4+
curl \
5+
ca-certificates \
6+
unzip \
7+
openjdk-8-jre \
8+
python \
9+
gcc \
10+
libc6-dev
11+
12+
COPY android-ndk.sh /
13+
RUN /android-ndk.sh x86_64
14+
ENV PATH=$PATH:/android-toolchain/bin
15+
16+
# TODO: run tests in an emulator eventually
17+
ENV CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android-gcc \
18+
CARGO_TARGET_X86_64_LINUX_ANDROID_RUNNER="true"

‎ci/run-docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
set -ex
55

66
run() {
7-
docker build -t backtrace ci/docker/$1
7+
docker build -t backtrace -f ci/docker/$1/Dockerfile ci
88
mkdir -p target
99
docker run \
1010
--user `id -u`:`id -g` \

0 commit comments

Comments
 (0)