diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-12-27 23:25:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-27 23:25:24 -0500 |
| commit | 9009c20edb066811417aa1a044e643f1d4050f7c (patch) | |
| tree | 27e1fd21eb4bdfe2a8531246ddf873ca66267e8e | |
| parent | c8b30307b7df0ccdc83b261733ae83bf7ff9c384 (diff) | |
| parent | 068399b13b35e2c28c6139b106f6afe522700a7d (diff) | |
| download | rneovim-9009c20edb066811417aa1a044e643f1d4050f7c.tar.gz rneovim-9009c20edb066811417aa1a044e643f1d4050f7c.tar.bz2 rneovim-9009c20edb066811417aa1a044e643f1d4050f7c.zip | |
Merge pull request #5827 from justinmk/travisupdate
ci: Install cscope, remove deadsnakes PPA
| -rwxr-xr-x | .ci/before_install.sh | 11 | ||||
| -rwxr-xr-x | .ci/install.sh | 6 | ||||
| -rw-r--r-- | .travis.yml | 5 |
3 files changed, 7 insertions, 15 deletions
diff --git a/.ci/before_install.sh b/.ci/before_install.sh index 1bdd89de42..9aac37de12 100755 --- a/.ci/before_install.sh +++ b/.ci/before_install.sh @@ -11,18 +11,15 @@ if [[ "${TRAVIS_OS_NAME}" == osx ]]; then brew update fi -echo "Upgrade Python 2's pip." +echo "Upgrade Python 2 pip." pip2.7 -q install --user --upgrade pip if [[ "${TRAVIS_OS_NAME}" == osx ]]; then echo "Install Python 3." brew install python3 - echo "Upgrade Python 3's pip." + echo "Upgrade Python 3 pip." pip3 -q install --user --upgrade pip else - # TODO: Replace with upgrade when Travis gets python3-pip package. - echo "Install pip for Python 3." - curl -sSL https://bootstrap.pypa.io/get-pip.py -o "${HOME}/get-pip.py" - # After this, pip in PATH will refer to Python 3's pip. - python3.3 "${HOME}/get-pip.py" --user --upgrade + echo "Upgrade Python 3 pip." + pip3 -q install --user --upgrade pip fi diff --git a/.ci/install.sh b/.ci/install.sh index 9df5b6e980..98d3dc01cb 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -17,11 +17,7 @@ echo "Install neovim module and coveralls for Python 2." CC=cc pip2.7 -q install --user --upgrade neovim cpp-coveralls echo "Install neovim module for Python 3." -if [[ "${TRAVIS_OS_NAME}" == osx ]]; then - CC=cc pip3 -q install --user --upgrade neovim -else - CC=cc pip3.3 -q install --user --upgrade neovim -fi +CC=cc pip3 -q install --user --upgrade neovim echo "Install neovim RubyGem." gem install --no-document --version ">= 0.2.0" neovim diff --git a/.travis.yml b/.travis.yml index 98c0b2e618..0baf3feb74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: trusty sudo: false language: c @@ -92,8 +93,6 @@ after_success: .ci/after_success.sh addons: apt: sources: - # TODO: Remove PPA when Travis gets Python >=3.3. - - deadsnakes - ubuntu-toolchain-r-test - llvm-toolchain-precise-3.8 packages: @@ -102,6 +101,7 @@ addons: - build-essential - clang-3.8 - cmake + - cscope - g++-5-multilib - g++-multilib - gcc-5-multilib @@ -111,7 +111,6 @@ addons: - libtool - llvm-3.8-dev - pkg-config - - python3.3-dev - unzip - valgrind - xclip |