From 34886fa946b6feade7e9addad6f2e74baed7612d Mon Sep 17 00:00:00 2001 From: Dilawar Singh Date: Sun, 13 Jan 2019 10:07:54 +0530 Subject: [PATCH 1/3] Fixes to build failure on travis (OSX). --- .travis.yml | 5 ++++- .travis/travis_prepare_osx.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e691222590..7b902782e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,10 @@ os: - linux - osx -osx_image: xcode10 +matrix: + include: + - os : osx + osx_image: xcode10.1 notifications: email: diff --git a/.travis/travis_prepare_osx.sh b/.travis/travis_prepare_osx.sh index d8aa29a171..12bc0df035 100755 --- a/.travis/travis_prepare_osx.sh +++ b/.travis/travis_prepare_osx.sh @@ -22,7 +22,7 @@ set +e #rvm get head #brew update #brew outdated cmake || brew install cmake -brew install gsl +brew install gsl || brew update gsl brew install hdf5 brew install python brew install numpy From 8612938f877595af562c0a2388e21ff0b6ad2de9 Mon Sep 17 00:00:00 2001 From: Dilawar Singh Date: Sun, 13 Jan 2019 10:25:58 +0530 Subject: [PATCH 2/3] Potential fixes to travis. --- .travis/travis_prepare_osx.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis/travis_prepare_osx.sh b/.travis/travis_prepare_osx.sh index 12bc0df035..d56638ed70 100755 --- a/.travis/travis_prepare_osx.sh +++ b/.travis/travis_prepare_osx.sh @@ -20,9 +20,9 @@ set -o nounset # Treat unset variables as an error set +e #rvm get head -#brew update -#brew outdated cmake || brew install cmake -brew install gsl || brew update gsl +brew update || echo "failed to update" +brew outdated cmake || brew install cmake +brew install gsl || brew upgrade gsl brew install hdf5 brew install python brew install numpy From affa5f4258398612ee71d14aee48c92afb3ead2a Mon Sep 17 00:00:00 2001 From: Dilawar Singh Date: Sun, 13 Jan 2019 10:32:49 +0530 Subject: [PATCH 3/3] Updated xcode10 images. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7b902782e0..c4aa5e9178 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ os: matrix: include: - os : osx - osx_image: xcode10.1 + osx_image: xcode10 notifications: email: