travis: use newer xcode version (fix build)

v0.27.3
Luis Díaz Más 6 years ago
parent 506c7900b1
commit daf7e15d61

@ -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" 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 - os: osx
osx_image: xcode9 osx_image: xcode10.2
compiler: clang 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 install: ./ci/install.sh
script: ./ci/run.sh script: ./ci/run.sh

@ -13,14 +13,7 @@ if [[ "$(uname -s)" == 'Linux' ]]; then
source conan/bin/activate source conan/bin/activate
else else
brew update brew update
brew install md5sha1sum pyenv-virtualenv brew install 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
export PATH="/Users/travis/.pyenv/shims:${PATH}" export PATH="/Users/travis/.pyenv/shims:${PATH}"
eval "$(pyenv init -)" eval "$(pyenv init -)"
eval "$(pyenv virtualenv-init -)" eval "$(pyenv virtualenv-init -)"
@ -29,7 +22,6 @@ else
fi fi
python --version python --version
pip install urllib3[secure] -U #Should solve SSL issues
pip install conan==1.11.2 pip install conan==1.11.2
pip install codecov pip install codecov
conan --version conan --version

@ -16,7 +16,6 @@ if [[ "$(uname -s)" == 'Linux' ]]; then
fi fi
else else
export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=ON" export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=ON"
export PYENV_VERSION=$PYTHON
export PATH="/Users/travis/.pyenv/shims:${PATH}" export PATH="/Users/travis/.pyenv/shims:${PATH}"
eval "$(pyenv init -)" eval "$(pyenv init -)"
eval "$(pyenv virtualenv-init -)" eval "$(pyenv virtualenv-init -)"

Loading…
Cancel
Save