aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Hinz <mh.codebro@gmail.com>2018-11-20 10:05:07 +0100
committerMarco Hinz <mh.codebro@gmail.com>2018-11-24 22:56:24 +0100
commit2f6364ea4b54a1ff337d0e5168454c4949e3fd8a (patch)
tree3ee696c80569b6ca0788b8878a1e35344e0433dc
parent8b39e4ec793334be0e48101830f66e05691393bd (diff)
downloadrneovim-2f6364ea4b54a1ff337d0e5168454c4949e3fd8a.tar.gz
rneovim-2f6364ea4b54a1ff337d0e5168454c4949e3fd8a.tar.bz2
rneovim-2f6364ea4b54a1ff337d0e5168454c4949e3fd8a.zip
travis: switch from Ubuntu 14.04 to 16.04
Travis is phasing out its support for containers, so we remove the `sudo: false`, which will be a no-op soon. Reference: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration Changes for Linux: - Xenial comes with libtool installed already. It only provides "libtoolize", though. For "libtool" we need to install libtool-bin.
-rw-r--r--.travis.yml8
-rwxr-xr-xci/install.sh4
2 files changed, 5 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 8ad9d7a6fb..7674ecb0c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
-dist: trusty
-sudo: false
+dist: xenial
+
language: c
env:
@@ -96,9 +96,9 @@ before_cache: ci/before_cache.sh
addons:
apt:
packages:
+ - apport
- autoconf
- automake
- - apport
- build-essential
- clang
- cmake
@@ -108,7 +108,7 @@ addons:
- gdb
- language-pack-tr
- libc6-dev-i386
- - libtool
+ - libtool-bin
- locales
- ninja-build
- pkg-config
diff --git a/ci/install.sh b/ci/install.sh
index 4aefe22fb5..7efbaf33b5 100755
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -8,10 +8,8 @@ if [[ "${CI_TARGET}" == lint ]]; then
fi
if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
- brew install ninja
- brew install gettext
- brew reinstall libtool
brew install ccache
+ brew install ninja
export PATH="/usr/local/opt/ccache/libexec:$PATH"
fi