diff --git a/.travis.sh b/.travis.sh index 0e94b0a9..c6e09c6f 100644 --- a/.travis.sh +++ b/.travis.sh @@ -6,10 +6,6 @@ export RUST_BACKTRACE=1 if [ `uname` = Darwin ] then - (xcrun simctl list devices | grep Booted) || xcrun simctl boot "iPhone 6" - rustup target install "x86_64-apple-ios" - pip2 install six - pip2 install six export OPENSSL_INCLUDE_DIR=`brew --prefix openssl`/include export OPENSSL_LIB_DIR=`brew --prefix openssl`/lib fi @@ -36,20 +32,6 @@ echo "##" echo "## latest failure was expected ##" echo "##" -if [ `uname` = Darwin ] -then - ( \ - cd test-ws \ - && cargo clean \ - && $CARGO_DINGHY --platform 'auto-ios-x86_64' test pass \ - && ! $CARGO_DINGHY --platform 'auto-ios-x86_64' test fails \ - ) - echo "##" - echo "## latest failure was expected" - echo "##" -fi - - # Test in project subdir ( \ cd test-ws/test-app \ @@ -61,20 +43,6 @@ echo "##" echo "## latest failure was expected ##" echo "##" -if [ `uname` = Darwin ] -then - ( \ - cd test-ws/test-app \ - && cargo clean \ - && $CARGO_DINGHY --platform 'auto-ios-x86_64' test pass \ - && ! $CARGO_DINGHY --platform 'auto-ios-x86_64' test fails \ - ) - echo "##" - echo "## latest failure was expected" - echo "##" -fi - - # Test from workspace root with project filter ( \ cd test-ws \ @@ -86,19 +54,6 @@ echo "##" echo "## latest failure was expected ##" echo "##" -if [ `uname` = Darwin ] -then - ( \ - cd test-ws \ - && cargo clean \ - && $CARGO_DINGHY --platform 'auto-ios-x86_64' test -p test-app pass \ - && ! $CARGO_DINGHY --platform 'auto-ios-x86_64' test -p test-app fails \ - ) - echo "##" - echo "## latest failure was expected ##" - echo "##" -fi - if [ -n "$DEPLOY" ] then cargo build --release -p cargo-dinghy diff --git a/.travis.yml b/.travis.yml index 06cce3a6..bf4ab6fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ matrix: - rust: nightly include: - os: osx - osx_image: xcode8.3 + osx_image: xcode9.3 env: DEPLOY=macos - os: linux dist: trusty