diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | ci/before_install.sh | 10 | ||||
| -rwxr-xr-x | ci/install.sh | 10 |
3 files changed, 8 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index 5f848e7ced..de4e63c020 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,6 @@ env: global: # To force rebuilding of third-party dependencies, set this to 'true'. - BUILD_NVIM_DEPS=false - # Update PATH for pip. - - PATH="$(python2.7 -c 'import site; print(site.getuserbase())')/bin:$PATH" # Build directory for Neovim. - BUILD_DIR="$TRAVIS_BUILD_DIR/build" # Build directory for third-party dependencies. @@ -69,11 +67,9 @@ jobs: - os: osx compiler: clang osx_image: xcode7.3 # macOS 10.11 - env: PATH="/usr/local/opt/python@2/bin:$PATH" - os: osx compiler: gcc osx_image: xcode7.3 # macOS 10.11 - env: PATH="/usr/local/opt/python@2/bin:$PATH" - os: linux env: CI_TARGET=lint - stage: Flaky builds diff --git a/ci/before_install.sh b/ci/before_install.sh index f696b85afc..9a3e192536 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -24,19 +24,13 @@ echo 'python info:' ) | sed 's/^/ /' if [[ "${TRAVIS_OS_NAME}" == osx ]]; then - echo "Install Python 2." - brew install python@2 -fi - -echo "Upgrade Python 2 pip." -pip2.7 -q install --user --upgrade pip - -if [[ "${TRAVIS_OS_NAME}" == osx ]]; then echo "Upgrade Python 3." brew upgrade python echo "Upgrade Python 3 pip." pip3 -q install --user --upgrade pip else + echo "Upgrade Python 2 pip." + pip2.7 -q install --user --upgrade pip echo "Upgrade Python 3 pip." # Allow failure. pyenv pip3 on travis is broken: # https://github.com/travis-ci/travis-ci/issues/8363 diff --git a/ci/install.sh b/ci/install.sh index 9deaa601b4..053549d6db 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -13,16 +13,18 @@ if [[ "${TRAVIS_OS_NAME}" == osx ]]; then brew reinstall -s libtool fi -# Use default CC to avoid compilation problems when installing Python modules. -echo "Install neovim module for Python 2." -CC=cc pip2.7 -q install --user --upgrade neovim - echo "Install neovim module for Python 3." # Allow failure. pyenv pip3 on travis is broken: # https://github.com/travis-ci/travis-ci/issues/8363 CC=cc pip3 -q install --user --upgrade neovim || true if ! [ "${TRAVIS_OS_NAME}" = osx ] ; then + # Update PATH for pip. + export PATH="$(python2.7 -c 'import site; print(site.getuserbase())')/bin:$PATH" + # Use default CC to avoid compilation problems when installing Python modules. + echo "Install neovim module for Python 2." + CC=cc pip2.7 -q install --user --upgrade neovim + echo "Install neovim RubyGem." gem install --no-document --version ">= 0.2.0" neovim fi |