Просмотр исходного кода

[TravisCI] fix cpp build failure, install/upgrade brew packages in one place

frabbit 8 лет назад
Родитель
Сommit
1438591839
1 измененных файлов с 6 добавлено и 6 удалено
  1. 6 6
      .travis.yml

+ 6 - 6
.travis.yml

@@ -124,14 +124,17 @@ install_osx: &install_osx
     fi
   # Install dependencies
   - brew uninstall --force brew-cask # https://github.com/caskroom/homebrew-cask/pull/15381
-  - travis_retry brew update --merge
-  - travis_retry brew install opam ninja;
+  - if [ $BREW_UPDATE = 1 ]; then
+      travis_retry brew update --merge;
+    fi
+  - travis_retry brew install opam ninja zlib pcre mysql awscli;
+  - brew outdated cmake || brew upgrade cmake # we need a recent cmake to use CMAKE_OSX_DEPLOYMENT_TARGET
   - export OPAMYES=1
   - opam init
   - opam install camlp4 sedlex ocamlfind xml-light extlib rope ptmap
   - eval `opam config env`
   # Install neko
-  - brew upgrade cmake # we need a recent cmake to use CMAKE_OSX_DEPLOYMENT_TARGET
+
   - if [ ! -d "$HOME/neko" ]; then
       mkdir $HOME/neko;
       pushd $HOME/neko;
@@ -152,13 +155,11 @@ install_osx: &install_osx
   - sudo ninja install
   - popd
   # Setup database
-  - travis_retry brew install mysql
   - mysql.server start
   - mysql -u root -e "create user if not exists travis@localhost identified by '';"
   - mysql -u root -e "create database haxe_test;"
   - mysql -u root -e "grant all on haxe_test.* to travis@localhost;"
   # Build haxe
-  - travis_retry brew install zlib pcre
   - if [ -d "$HOME/_hxbuild" ]; then
       echo "$HOME/_hxbuild exists";
       cp -pr ~/_hxbuild ./_build;
@@ -175,7 +176,6 @@ install_osx: &install_osx
         mkdir ~/_hxbuild;
     fi
   - cp -prf ./_build/* ~/_hxbuild/
-  - travis_retry brew install awscli
 
 matrix:
   include: