Skip to content

Commit e12ff77

Browse files
committed
Merge #640
640: Add iOS as a Tier 3 platform r=Susurrus With this and #639, then we have at least basic testing recurring for all mobile platforms (note that this is more than the `libc` currently tests, so we may have trouble moving the non-x86 targets to Tier2 until that happens).
2 parents baba879 + 8809064 commit e12ff77

File tree

3 files changed

+59
-0
lines changed

3 files changed

+59
-0
lines changed

.travis.yml

+34
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,23 @@ matrix:
2727
- env: TARGET=x86_64-linux-android DISABLE_TESTS=1
2828
rust: 1.13.0
2929

30+
# iOS
31+
- env: TARGET=aarch64-apple-ios DISABLE_TESTS=1
32+
rust: 1.13.0
33+
os: osx
34+
- env: TARGET=armv7-apple-ios DISABLE_TESTS=1
35+
rust: 1.13.0
36+
os: osx
37+
- env: TARGET=armv7s-apple-ios DISABLE_TESTS=1
38+
rust: 1.13.0
39+
os: osx
40+
- env: TARGET=i386-apple-ios DISABLE_TESTS=1
41+
rust: 1.13.0
42+
os: osx
43+
- env: TARGET=x86_64-apple-ios DISABLE_TESTS=1
44+
rust: 1.13.0
45+
os: osx
46+
3047
# Linux
3148
- env: TARGET=aarch64-unknown-linux-gnu
3249
rust: 1.13.0
@@ -99,6 +116,23 @@ matrix:
99116
- env: TARGET=x86_64-linux-android DISABLE_TESTS=1
100117
rust: 1.13.0
101118

119+
# iOS is still being worked on, so for now don't block on compilation failures
120+
- env: TARGET=aarch64-apple-ios DISABLE_TESTS=1
121+
rust: 1.13.0
122+
os: osx
123+
- env: TARGET=armv7-apple-ios DISABLE_TESTS=1
124+
rust: 1.13.0
125+
os: osx
126+
- env: TARGET=armv7s-apple-ios DISABLE_TESTS=1
127+
rust: 1.13.0
128+
os: osx
129+
- env: TARGET=i386-apple-ios DISABLE_TESTS=1
130+
rust: 1.13.0
131+
os: osx
132+
- env: TARGET=x86_64-apple-ios DISABLE_TESTS=1
133+
rust: 1.13.0
134+
os: osx
135+
102136
# Failures for nightlies may be because of compiler bugs, so don't fail the
103137
# build if these fail.
104138
- env: TARGET=x86_64-unknown-linux-gnu

README.md

+5
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,15 @@ Tier 2:
7070
* x86_64-unknown-netbsd
7171

7272
Tier 3:
73+
* aarch64-apple-ios
7374
* aarch64-linux-android
7475
* arm-linux-androideabi
76+
* armv7-apple-ios
7577
* armv7-linux-androideabi
78+
* armv7s-apple-ios
79+
* i386-apple-ios
7680
* i686-linux-android
81+
* x86_64-apple-ios
7782
* x86_64-linux-android
7883

7984
## Usage

ci/install.sh

+20
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,26 @@ main() {
1010
sort=gsort # for `sort --sort-version`, from brew's coreutils.
1111
fi
1212

13+
# Builds for iOS are done on OSX, but require the specific target to be
14+
# installed.
15+
case $TARGET in
16+
aarch64-apple-ios)
17+
rustup target install aarch64-apple-ios
18+
;;
19+
armv7-apple-ios)
20+
rustup target install armv7-apple-ios
21+
;;
22+
armv7s-apple-ios)
23+
rustup target install armv7s-apple-ios
24+
;;
25+
i386-apple-ios)
26+
rustup target install i386-apple-ios
27+
;;
28+
x86_64-apple-ios)
29+
rustup target install x86_64-apple-ios
30+
;;
31+
esac
32+
1333
# This fetches latest stable release
1434
local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
1535
| cut -d/ -f3 \

0 commit comments

Comments
 (0)