summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElvis Pranskevichus <elvis@magic.io>2018-05-01 12:18:48 -0400
committerElvis Pranskevichus <elvis@magic.io>2018-05-01 12:18:48 -0400
commitcc6a62c9dc94a4cd67f4c909699886cfecd16303 (patch)
treed638d6ffb8f06a688ecf8143f4f5127ccc3aaac5
parent4d966a1cf9acb21c9f71f2a630da11e4ac848502 (diff)
downloadimmutables-0.5.tar.gz
immutables-0.5.zip
Unbreak macOS build on Travisv0.5
-rwxr-xr-x.ci/travis-before-install.sh6
-rw-r--r--.travis.yml4
2 files changed, 5 insertions, 5 deletions
diff --git a/.ci/travis-before-install.sh b/.ci/travis-before-install.sh
index fdc9202..13aaf32 100755
--- a/.ci/travis-before-install.sh
+++ b/.ci/travis-before-install.sh
@@ -3,14 +3,14 @@
set -e -x
if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
- git clone --depth 1 https://github.com/yyuu/pyenv.git ~/.pyenv
- PYENV_ROOT="$HOME/.pyenv"
- PATH="$PYENV_ROOT/bin:$PATH"
+ brew update >/dev/null
+ brew upgrade pyenv
eval "$(pyenv init -)"
if ! (pyenv versions | grep "${PYTHON_VERSION}$"); then
pyenv install ${PYTHON_VERSION}
fi
+
pyenv global ${PYTHON_VERSION}
pyenv rehash
fi
diff --git a/.travis.yml b/.travis.yml
index 60c7eb8..501e0df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,11 +38,11 @@ matrix:
services: [docker]
- os: osx
- env: BUILD=tests,wheels PYTHON_VERSION=3.5.4 PIP_USER=1
+ env: BUILD=tests,wheels PYTHON_VERSION=3.5.5
- os: osx
osx_image: xcode8.3
- env: BUILD=tests,wheels PYTHON_VERSION=3.6.4 PIP_USER=1
+ env: BUILD=tests,wheels PYTHON_VERSION=3.6.5
allow_failures:
- python: "3.7-dev"