Skip to content

Commit

Permalink
Merge #640
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
bors[bot] committed Jul 3, 2017
2 parents 1bd18d5 + f008cc6 commit 30a58d9
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 0 deletions.
34 changes: 34 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,23 @@ matrix:
- env: TARGET=x86_64-linux-android DISABLE_TESTS=1
rust: 1.13.0

# iOS
- env: TARGET=aarch64-apple-ios DISABLE_TESTS=1
rust: 1.13.0
os: osx
- env: TARGET=armv7-apple-ios DISABLE_TESTS=1
rust: 1.13.0
os: osx
- env: TARGET=armv7s-apple-ios DISABLE_TESTS=1
rust: 1.13.0
os: osx
- env: TARGET=i386-apple-ios DISABLE_TESTS=1
rust: 1.13.0
os: osx
- env: TARGET=x86_64-apple-ios DISABLE_TESTS=1
rust: 1.13.0
os: osx

# Linux
- env: TARGET=aarch64-unknown-linux-gnu
rust: 1.13.0
Expand Down Expand Up @@ -99,6 +116,23 @@ matrix:
- env: TARGET=x86_64-linux-android DISABLE_TESTS=1
rust: 1.13.0

# iOS is still being worked on, so for now don't block on compilation failures
- env: TARGET=aarch64-apple-ios DISABLE_TESTS=1
rust: 1.13.0
os: osx
- env: TARGET=armv7-apple-ios DISABLE_TESTS=1
rust: 1.13.0
os: osx
- env: TARGET=armv7s-apple-ios DISABLE_TESTS=1
rust: 1.13.0
os: osx
- env: TARGET=i386-apple-ios DISABLE_TESTS=1
rust: 1.13.0
os: osx
- env: TARGET=x86_64-apple-ios DISABLE_TESTS=1
rust: 1.13.0
os: osx

# Failures for nightlies may be because of compiler bugs, so don't fail the
# build if these fail.
- env: TARGET=x86_64-unknown-linux-gnu
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,15 @@ Tier 2:
* x86_64-unknown-netbsd

Tier 3:
* aarch64-apple-ios
* aarch64-linux-android
* arm-linux-androideabi
* armv7-apple-ios
* armv7-linux-androideabi
* armv7s-apple-ios
* i386-apple-ios
* i686-linux-android
* x86_64-apple-ios
* x86_64-linux-android

## Usage
Expand Down
20 changes: 20 additions & 0 deletions ci/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,26 @@ main() {
sort=gsort # for `sort --sort-version`, from brew's coreutils.
fi

# Builds for iOS are done on OSX, but require the specific target to be
# installed.
case $TARGET in
aarch64-apple-ios)
rustup target install aarch64-apple-ios
;;
armv7-apple-ios)
rustup target install armv7-apple-ios
;;
armv7s-apple-ios)
rustup target install armv7s-apple-ios
;;
i386-apple-ios)
rustup target install i386-apple-ios
;;
x86_64-apple-ios)
rustup target install x86_64-apple-ios
;;
esac

# This fetches latest stable release
local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
| cut -d/ -f3 \
Expand Down

0 comments on commit 30a58d9

Please sign in to comment.