From ccba36a71d53e8bcc4b5ac6d4410e758a9b8dcb8 Mon Sep 17 00:00:00 2001 From: Bernard Lefebvre Date: Wed, 11 Apr 2018 16:32:01 -0400 Subject: [PATCH 01/15] Change a comment --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f0f4a67715..58f201e322 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ before_install: sudo apt-get install -y -qq texlive-full; sudo apt-get install -y -qq freeglut3-dev libglew-dev libxmu-dev libxi-dev; fi - # OSX ones + # OSX ones - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install glew; From ff42d47cda7e1d543cfafab91441021abf9709eb Mon Sep 17 00:00:00 2001 From: Bernard Lefebvre Date: Wed, 11 Apr 2018 16:48:10 -0400 Subject: [PATCH 02/15] try to update python --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 58f201e322..32f8a510f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,9 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install glew; + brew search python; + brew install python; + brew search python; fi # Run the Build script From 9d20e3a0c9bcbde78492e63a1fe7f821e5948634 Mon Sep 17 00:00:00 2001 From: Bernard Lefebvre Date: Wed, 11 Apr 2018 17:03:53 -0400 Subject: [PATCH 03/15] Try other osx images --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 32f8a510f2..c59bb78462 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,11 @@ matrix: - os: osx language: cpp compiler: clang + osx_image: xcode9.2 - os: osx language: cpp compiler: gcc + osx_image: xcode9.3 - os: osx language: cpp compiler: clang From 5b549ef2f11a668da977228baa93bbd1889fba09 Mon Sep 17 00:00:00 2001 From: Bernard Lefebvre Date: Thu, 12 Apr 2018 09:23:36 -0400 Subject: [PATCH 04/15] Update python --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c59bb78462..2c85a933c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,9 +37,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install glew; - brew search python; - brew install python; - brew search python; + brew outdated python || brew upgrade python; fi # Run the Build script From fdc52cd41c795e2b5ce291d2441248212dbde61a Mon Sep 17 00:00:00 2001 From: Bernard Lefebvre Date: Thu, 12 Apr 2018 09:50:14 -0400 Subject: [PATCH 05/15] python & openssl --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2c85a933c0..9e0edbacff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,8 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install glew; - brew outdated python || brew upgrade python; + brew install openssl; + brew install python@2; fi # Run the Build script From 289d157819f0ea62eb963a653016f0c543ff8b8b Mon Sep 17 00:00:00 2001 From: Bernard Lefebvre Date: Thu, 12 Apr 2018 09:58:46 -0400 Subject: [PATCH 06/15] Try again to update openssl --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e0edbacff..b185d12b15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,8 +37,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install glew; - brew install openssl; - brew install python@2; + brew outdated openssl || brew upgrade openssl; fi # Run the Build script From 23fafab7408e9d6bde2b0f995c0ba45638e68dae Mon Sep 17 00:00:00 2001 From: Bernard Lefebvre Date: Thu, 12 Apr 2018 10:18:40 -0400 Subject: [PATCH 07/15] python openssl --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b185d12b15..5b056d6f64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,9 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install glew; - brew outdated openssl || brew upgrade openssl; + brew link openssl --force; + brew install python --with-brewed-openssl; + sudo ln -s /usr/local/Cellar/python/2.7.10/bin/python /usr/local/bin/python; fi # Run the Build script From e3aed19f18b9ba11c38c12b4ea7e839f39a32ba4 Mon Sep 17 00:00:00 2001 From: Bernard Lefebvre Date: Thu, 12 Apr 2018 10:53:10 -0400 Subject: [PATCH 08/15] Python info. --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b056d6f64..9ab2cd8179 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,9 +37,8 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install glew; - brew link openssl --force; - brew install python --with-brewed-openssl; - sudo ln -s /usr/local/Cellar/python/2.7.10/bin/python /usr/local/bin/python; + brew info python; + python -V; fi # Run the Build script From 8b23aac270b80e42cfaf10d4fe73f8630875d5bb Mon Sep 17 00:00:00 2001 From: Bernard Lefebvre Date: Thu, 12 Apr 2018 11:09:27 -0400 Subject: [PATCH 09/15] adjust python version --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ab2cd8179..ddff02ba9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,15 +3,13 @@ matrix: include: - - os: linux + - os: osx language: cpp compiler: clang - - os: linux - language: cpp - compiler: gcc + osx_image: xcode9.1 - os: osx language: cpp - compiler: clang + compiler: gcc osx_image: xcode9.2 - os: osx language: cpp @@ -20,7 +18,7 @@ matrix: - os: osx language: cpp compiler: clang - osx_image: xcode9.1 + osx_image: xcode9.3 env: - OPTIONS="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_TESTS=yes -DOCIO_BUILD_DOCS=yes" @@ -39,6 +37,9 @@ before_install: brew install glew; brew info python; python -V; + brew link openssl --force; + brew install python --with-brewed-openssl; + sudo ln -s /usr/local/Cellar/python/2.7.14/bin/python /usr/local/bin/python; fi # Run the Build script From 0245d5a0a1bf5eefc481d60404a91e1162577c93 Mon Sep 17 00:00:00 2001 From: Bernard Lefebvre Date: Thu, 12 Apr 2018 11:24:38 -0400 Subject: [PATCH 10/15] Still trying --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ddff02ba9f..8575e5c999 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,9 +37,10 @@ before_install: brew install glew; brew info python; python -V; - brew link openssl --force; - brew install python --with-brewed-openssl; - sudo ln -s /usr/local/Cellar/python/2.7.14/bin/python /usr/local/bin/python; + brew upgrade python; + python -V; + brew unlink python && brew link python; + python -V; fi # Run the Build script From 43f3ec08d8423e7070e5b442d5a36367cca4f1f9 Mon Sep 17 00:00:00 2001 From: Bernard Lefebvre Date: Thu, 12 Apr 2018 11:51:55 -0400 Subject: [PATCH 11/15] Install makupsafe early --- .travis.yml | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8575e5c999..5748c49ace 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,22 +3,9 @@ matrix: include: - - os: osx - language: cpp - compiler: clang - osx_image: xcode9.1 - - os: osx - language: cpp - compiler: gcc - osx_image: xcode9.2 - os: osx language: cpp compiler: gcc - osx_image: xcode9.3 - - os: osx - language: cpp - compiler: clang - osx_image: xcode9.3 env: - OPTIONS="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_TESTS=yes -DOCIO_BUILD_DOCS=yes" @@ -35,12 +22,9 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install glew; - brew info python; - python -V; - brew upgrade python; - python -V; - brew unlink python && brew link python; python -V; + pip install markupsafe; + pip3 install markupsafe; fi # Run the Build script From 0a30e46b4578e73ce2b19646393542b51d24ee0f Mon Sep 17 00:00:00 2001 From: Bernard Lefebvre Date: Thu, 12 Apr 2018 12:14:08 -0400 Subject: [PATCH 12/15] pyenv --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5748c49ace..0c0ec68aa9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,11 @@ before_install: brew update; brew install glew; python -V; - pip install markupsafe; - pip3 install markupsafe; + brew install pyenv; + echo 'eval "$(pyenv init -)"' >> .bashrc; + source .bashrc; + pyenv install 3.5.2; + pyenv global 3.5.2; fi # Run the Build script From 37aeb1c8af0b03e3f86010e6cb29874a35ffc2dd Mon Sep 17 00:00:00 2001 From: Bernard Lefebvre Date: Thu, 12 Apr 2018 12:57:30 -0400 Subject: [PATCH 13/15] Verify all builds with pyenv --- .travis.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c0ec68aa9..a9baef59f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,22 @@ matrix: include: + - os: linux + language: cpp + compiler: clang + - os: linux + language: cpp + compiler: gcc + - os: osx + language: cpp + compiler: clang - os: osx language: cpp compiler: gcc + - os: osx + language: cpp + compiler: clang + osx_image: xcode9.1 env: - OPTIONS="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_TESTS=yes -DOCIO_BUILD_DOCS=yes" @@ -18,12 +31,10 @@ before_install: sudo apt-get install -y -qq texlive-full; sudo apt-get install -y -qq freeglut3-dev libglew-dev libxmu-dev libxi-dev; fi - # OSX ones + # OSX ones - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install glew; - python -V; - brew install pyenv; echo 'eval "$(pyenv init -)"' >> .bashrc; source .bashrc; pyenv install 3.5.2; From c1bdf233b6b9b00bb008a7de39648509bf494dcb Mon Sep 17 00:00:00 2001 From: Bernard Lefebvre Date: Thu, 12 Apr 2018 14:03:34 -0400 Subject: [PATCH 14/15] remove .bashrc --- .travis.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index a9baef59f3..cbb9ae2dd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,22 +3,9 @@ matrix: include: - - os: linux - language: cpp - compiler: clang - - os: linux - language: cpp - compiler: gcc - - os: osx - language: cpp - compiler: clang - os: osx language: cpp compiler: gcc - - os: osx - language: cpp - compiler: clang - osx_image: xcode9.1 env: - OPTIONS="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_TESTS=yes -DOCIO_BUILD_DOCS=yes" @@ -35,8 +22,6 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install glew; - echo 'eval "$(pyenv init -)"' >> .bashrc; - source .bashrc; pyenv install 3.5.2; pyenv global 3.5.2; fi From 88824fff01ec7667c3a1cf305168e2ad38261ba0 Mon Sep 17 00:00:00 2001 From: Bernard Lefebvre Date: Thu, 12 Apr 2018 14:27:20 -0400 Subject: [PATCH 15/15] using bash_profile instead of bashrc --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index cbb9ae2dd4..c77f2ae3cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,8 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install glew; + echo 'eval "$(pyenv init -)"' >> .bash_profile; + source .bash_profile; pyenv install 3.5.2; pyenv global 3.5.2; fi