From 880906423626243a3f777a4b7b2403df5ac65b14 Mon Sep 17 00:00:00 2001 From: Bryant Mairs Date: Fri, 30 Jun 2017 11:00:38 -0700 Subject: [PATCH] Add iOS as a Tier 3 platform --- .travis.yml | 34 ++++++++++++++++++++++++++++++++++ README.md | 5 +++++ ci/install.sh | 20 ++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6d0b82d1ca..6ecb33f6c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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 diff --git a/README.md b/README.md index 437aa25cab..3f51a51209 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/ci/install.sh b/ci/install.sh index 748ad9a9e8..80e18e4720 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -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 \