diff --git a/.travis.yml b/.travis.yml index 74132a74..42b8724f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,9 +27,9 @@ matrix: env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON" - os: osx - osx_image: xcode9 + osx_image: xcode10.2 compiler: clang - env: PYTHON=3.6.2 CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_CURL=ON" + env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_CURL=ON" install: ./ci/install.sh script: ./ci/run.sh diff --git a/ci/install.sh b/ci/install.sh index 05224406..9528c779 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -13,14 +13,7 @@ if [[ "$(uname -s)" == 'Linux' ]]; then source conan/bin/activate else brew update - brew install md5sha1sum pyenv-virtualenv - export CFLAGS="-I/usr/local/opt/openssl/include $CFLAGS" - export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS" - pyenv install $PYTHON - # I would expect something like ``pyenv init; pyenv local $PYTHON`` or - # ``pyenv shell $PYTHON`` would work, but ``pyenv init`` doesn't seem to - # modify the Bash environment. ??? So, I hand-set the variables instead. - export PYENV_VERSION=$PYTHON + brew install pyenv-virtualenv export PATH="/Users/travis/.pyenv/shims:${PATH}" eval "$(pyenv init -)" eval "$(pyenv virtualenv-init -)" @@ -29,7 +22,6 @@ else fi python --version -pip install urllib3[secure] -U #Should solve SSL issues pip install conan==1.11.2 pip install codecov conan --version diff --git a/ci/run.sh b/ci/run.sh index 4b07c7e6..74f772d0 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -16,7 +16,6 @@ if [[ "$(uname -s)" == 'Linux' ]]; then fi else export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=ON" - export PYENV_VERSION=$PYTHON export PATH="/Users/travis/.pyenv/shims:${PATH}" eval "$(pyenv init -)" eval "$(pyenv virtualenv-init -)"