Browse Source

For CI - remove 32-bit only iOS build.
[ci only: OSX]

Yao Wei Tjong 姚伟忠 9 years ago
parent
commit
da3711f0e6
1 changed files with 8 additions and 23 deletions
  1. 8 23
      .travis.yml

+ 8 - 23
.travis.yml

@@ -352,7 +352,6 @@ env:
     - MAKEFILE=1    URHO3D_LIB_TYPE=SHARED URHO3D_DEPLOYMENT_TARGET=generic
     - XCODE=1       URHO3D_LIB_TYPE=STATIC CMAKE_OSX_DEPLOYMENT_TARGET=10.11 SF_DEFAULT=mac:OSX-64bit-STATIC.tar.gz
     - XCODE=1       URHO3D_LIB_TYPE=SHARED CMAKE_OSX_DEPLOYMENT_TARGET=10.11
-    - XCODE=1 IOS=1 URHO3D_LIB_TYPE=STATIC IPHONEOS_DEPLOYMENT_TARGET=9.1 sdk=iphonesimulator URHO3D_64BIT=0
     - XCODE=1 IOS=1 URHO3D_LIB_TYPE=STATIC IPHONEOS_DEPLOYMENT_TARGET=9.1 sdk=iphonesimulator
 matrix:
   fast_finish: true
@@ -361,32 +360,18 @@ before_script:
   - export TRAVIS_COMMIT=$TRAVIS_COMMIT~
   - export COMMIT_MESSAGE=$(git log --format=%B -n 1 $TRAVIS_COMMIT)
   - export TAG=$(git describe --exact-match $TRAVIS_COMMIT 2>/dev/null); if [[ $TAG =~ [[:digit:]]+\.[[:digit:]]+ ]]; then export RELEASE_TAG=$TAG; fi
-  - if [ $XCODE ] && ([ $RELEASE_TAG ] || (! [[ $TRAVIS_BRANCH =~ [^-]+-[^-]+-CI ]] && echo $COMMIT_MESSAGE |grep -cq '\[ci package\]')); then export PACKAGE_UPLOAD=1; doxygen='doxygen graphviz'; fi
+  - if [ $XCODE ] && ([ $RELEASE_TAG ] || (! [[ $TRAVIS_BRANCH =~ [^-]+-[^-]+-CI ]] && echo $COMMIT_MESSAGE |grep -cq '\[ci package\]')); then export PACKAGE_UPLOAD=1; fi
   - if [ $XCODE ] && echo $COMMIT_MESSAGE |egrep -cq '\[(ccache clear|xcode 64bit only)\]'; then export XCODE_64BIT_ONLY=1; fi
-  - which cmake >/dev/null 2>&1 || cmake=cmake
   - travis_retry brew update >/dev/null
+  - which cmake >/dev/null 2>&1 || cmake=cmake
+  - if [ $PACKAGE_UPLOAD ]; then doxygen='doxygen graphviz'; fi
   - travis_retry brew install ccache $cmake $doxygen
-  - if [ $PACKAGE_UPLOAD ]; then
-      whitelist='brew-cask ccache cmake doxygen graphviz libpng libyaml openssl pkg-config readline' &&
-      for f in $(brew list); do [[ $whitelist =~ $f ]] || travis_retry brew uninstall --force $f; done &&
-      for f in $(brew cask list); do [[ $whitelist =~ $f ]] || travis_retry brew cask uninstall --force $f; done &&
-      travis_retry brew cleanup;
-    fi
+  - whitelist='brew-cask ccache cmake doxygen graphviz libpng libyaml openssl pkg-config readline'
+  - for f in $(brew list); do [[ $whitelist =~ $f ]] || travis_retry brew uninstall --force $f; done
+  - for f in $(brew cask list); do [[ $whitelist =~ $f ]] || travis_retry brew cask uninstall --force $f; done
+  - travis_retry brew cleanup
   - export PATH=$(brew info ccache |grep -o '\S*lib\S*'):$PATH
-  - if [ $XCODE ]; then
-      sudo cp -p $(which ccache) $(dirname $(xcodebuild -find-executable clang)) &&
-      for compiler in clang clang++; do
-        path=$(xcodebuild -find-executable $compiler); sudo mv $path{,.orig} &&
-        sudo ln -sf $(dirname $path)/clang.orig /usr/bin/$compiler &&
-        sudo ln -sf ccache $path;
-      done &&
-      if [ $PACKAGE_UPLOAD ]; then
-        if [ $IOS ]; then redundant=AppleTV,Watch;
-        elif [ $TVOS ]; then redundant=iPhone,Watch;
-        else redundant=iPhone,AppleTV,Watch; fi &&
-        eval sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/{$redundant}{OS,Simulator}.platform;
-      fi;
-    fi
+  - if [ $XCODE ]; then sudo cp -p $(which ccache) $(dirname $(xcodebuild -find-executable clang)) && for compiler in clang clang++; do path=$(xcodebuild -find-executable $compiler); sudo mv $path{,.orig} && sudo ln -sf $(dirname $path)/clang.orig /usr/bin/$compiler && sudo ln -sf ccache $path; done && if [ $IOS ]; then redundant=AppleTV,Watch; elif [ $TVOS ]; then redundant=iPhone,Watch; else redundant=iPhone,AppleTV,Watch; fi && eval sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/{$redundant}{OS,Simulator}.platform; fi
   - rake ci_setup_cache
 script: rake ci && if [ $PACKAGE_UPLOAD ]; then rake ci_package_upload; fi && rake ci_timer
 after_script: rake ci_teardown_cache