summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2018-01-21 12:48:50 -0500
committerJeffrey Walton <noloader@gmail.com>2018-01-21 12:48:50 -0500
commit5631da3697ea7a8c926df4d2a71dcc62d2effff7 (patch)
treeddf2c36ed05d8a298201a0b67039381a499ecd1d
parent133b2411d40d2c3fd894635d712e78e6e1bcb97e (diff)
downloadcryptopp-git-5631da3697ea7a8c926df4d2a71dcc62d2effff7.tar.gz
Disable Travis iOS testing (GH #570)
-rw-r--r--.travis.yml31
-rwxr-xr-xTestScripts/install-android.sh2
2 files changed, 16 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml
index 6b0f7563..52c587ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,10 +32,6 @@ env:
- BUILD_MODE="debug"
- BUILD_MODE="asan"
- BUILD_MODE="ubsan"
- - BUILD_MODE="ios-arm"
- - BUILD_MODE="ios-arm64"
- - BUILD_MODE="ios-watch"
- - BUILD_MODE="ios-tv"
matrix:
@@ -88,18 +84,21 @@ matrix:
env:
- BUILD_MODE=android
- PLATFORM=x86_64
- - os: osx
- env:
- - BUILD_MODE=ios
- - PLATFORM=iPhoneOS
- - os: osx
- env:
- - BUILD_MODE=ios
- - PLATFORM=WatchOS
- - os: osx
- env:
- - BUILD_MODE=ios
- - PLATFORM=AppleTVOS
+
+ # Travis infrastructure problems, Issue 570
+ # Re-enable when OS X and iOS improves
+ #- os: osx
+ # env:
+ # - BUILD_MODE=ios
+ # - PLATFORM=iPhoneOS
+ #- os: osx
+ # env:
+ # - BUILD_MODE=ios
+ # - PLATFORM=WatchOS
+ #- os: osx
+ # env:
+ # - BUILD_MODE=ios
+ # - PLATFORM=AppleTVOS
before_install:
- |
diff --git a/TestScripts/install-android.sh b/TestScripts/install-android.sh
index 7c31ef60..09a56c17 100755
--- a/TestScripts/install-android.sh
+++ b/TestScripts/install-android.sh
@@ -14,4 +14,4 @@ echo y | $HOME/android/sdk/tools/bin/sdkmanager --update > /dev/null
for package in "ndk-bundle"; do
echo install android $package
echo y | $HOME/android/sdk/tools/bin/sdkmanager "$package" > /dev/null
-done
+done