Merge pull request #263 from czoido/simplify-ci

Use one osx version for CI
conan-io · Jul 9, 2020 · ff531b2 · ff531b2
2 parents 4ea2603 + 5e7702d
commit ff531b2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,23 @@
+
+
 matrix:
    include:
-       - os: osx 
-         osx_image: xcode8.3
-         language: generic 
-       - os: osx 
-         osx_image: xcode9.3
-         language: generic 
-       - os: osx 
-         osx_image: xcode10.3
-         language: generic 
        - os: osx 
          osx_image: xcode11.3
          language: generic 
+         cache:
+          directories:
+           - $HOME/Library/Caches/Homebrew
+           - /usr/local/Homebrew/
+         before_cache:
+          - brew cleanup
+         addons:
+          homebrew:
+           update: true
+           packages:
+            - pyenv
+            - pyenv-virtualenv
+            - cmake
        - os: linux
          env: CONAN_COMPILER=gcc CONAN_COMPILER_VERSION=5.4
          dist: xenial

diff --git a/.travis/install.sh b/.travis/install.sh
@@ -4,10 +4,6 @@ set -e
 set -x
 
 if [[ "$(uname -s)" == 'Darwin' ]]; then
-    brew update || brew update
-    brew outdated pyenv || brew upgrade pyenv
-    brew install pyenv-virtualenv
-    brew install cmake || true
 
     if which pyenv > /dev/null; then
         eval "$(pyenv init -)"