1
0
forked from aniani/vim

patch 8.2.0481: Travis is still using trusty

Problem:    Travis is still using trusty.
Solution:   Adjust config to use bionic. (Ozaki Kiichi, closes #5868)
This commit is contained in:
Bram Moolenaar
2020-03-30 19:13:29 +02:00
parent 0b37a2f379
commit 7d333a900d
3 changed files with 38 additions and 33 deletions

View File

@@ -26,13 +26,10 @@ _anchors:
linux: &linux linux: &linux
os: linux os: linux
dist: trusty dist: bionic
addons: addons:
apt: apt:
sources: packages:
# Need msgfmt 0.19.8 to be able to generate .desktop files
- sourceline: 'ppa:ricotz/toolchain'
packages: &linux-packages
- autoconf - autoconf
- clang - clang
- lcov - lcov
@@ -41,34 +38,33 @@ _anchors:
- libperl-dev - libperl-dev
- python-dev - python-dev
- python3-dev - python3-dev
- liblua5.2-dev - liblua5.3-dev
- lua5.2 - lua5.3
- ruby-dev - ruby-dev
- tcl-dev - tcl-dev
- cscope - cscope
- libgtk2.0-dev - libgtk2.0-dev
- desktop-file-utils - desktop-file-utils
- libtool-bin
services:
- xvfb
before_install: before_install:
- rvm reset - rvm reset
# Remove /opt/python/3.x.x/bin from $PATH for using system python3.
# ("pyenv global system" doesn't seem to work.)
- |
if [[ "$(which python3)" =~ ^/opt/python/ ]]; then
export PATH=$(py3=$(which python3); echo ${PATH//${py3%/python3}:/})
fi
# Use llvm-cov instead of gcov when compiler is clang. # Use llvm-cov instead of gcov when compiler is clang.
- | - |
if [[ "${CC}" = "clang" ]]; then if [[ "${CC}" = "clang" ]]; then
ln -sf "$(which llvm-cov)" /home/travis/bin/gcov ln -sf "$(command -v llvm-cov)" /home/travis/bin/gcov
fi
# Setup lua5.3 manually since its package doesn't provide alternative.
# https://bugs.launchpad.net/ubuntu/+source/lua5.3/+bug/1707212
- |
if [[ "${CONFOPT}" =~ luainterp ]]; then
sudo update-alternatives --install /usr/bin/lua lua /usr/bin/lua5.3 10
fi fi
before_script: before_script:
# Start virtual framebuffer to be able to test the GUI. For dists newer # On travis bionic-amd64 gethostbyname() resolves "localhost" to 127.0.1.1
# than trusty, the "services: xvfb" setting should be used instead # so that makes various channel tests fail.
- | - sudo sed -i '/^127\.0\.1\.1\s/s/\blocalhost\b//g' /etc/hosts
if [[ ${TRAVIS_DIST} = trusty ]]; then
export DISPLAY=:99.0
sh -e /etc/init.d/xvfb start && sleep 3
fi
- sudo bash ci/load-snd-dummy.sh || true - sudo bash ci/load-snd-dummy.sh || true
- sudo usermod -a -G audio $USER - sudo usermod -a -G audio $USER
- do_test() { sg audio "sg $(id -gn) '$*'"; } - do_test() { sg audio "sg $(id -gn) '$*'"; }
@@ -90,7 +86,7 @@ _anchors:
- /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/ - /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/
before_install: before_install:
- rvm reset - rvm reset
# Lua is not installed on Travis OSX # Lua is not installed on macOS
- export LUA_PREFIX=/usr/local - export LUA_PREFIX=/usr/local
coverage: &coverage coverage: &coverage
@@ -101,10 +97,10 @@ _anchors:
- (cd "${SRCDIR}" && bash <(curl -s https://codecov.io/bash)) - (cd "${SRCDIR}" && bash <(curl -s https://codecov.io/bash))
asan_symbolize: &asan_symbolize asan_symbolize: &asan_symbolize
- | # Update pyenv to fix the error "/opt/pyenv/libexec/pyenv: line 43: cd: asan_symbolize-6.0: Not a directory".
while read log; do # https://github.com/pyenv/pyenv/issues/580
asan_symbolize < "${log}" - (cd "${PYENV_ROOT}" && git fetch -p origin && git checkout "$(git rev-list --tags -n1)") &>/dev/null || true
done < <(find . -type f -name 'asan.*' -size +0) - find . -type f -name 'asan.*' -size +0 2>/dev/null | xargs -I{} -n1 -t asan_symbolize -l{}
branches: branches:
except: except:
@@ -205,15 +201,14 @@ jobs:
name: huge/gcc-s390x name: huge/gcc-s390x
compiler: gcc compiler: gcc
env: *linux-huge env: *linux-huge
addons: services: []
apt:
packages:
- *linux-packages
- libtool-bin
- <<: *linux - <<: *linux
name: huge+coverage/clang name: huge+coverage/clang
compiler: clang compiler: clang
env: *linux-huge env:
- *linux-huge
# Clang cannot compile test_libvterm with "--coverage" flag.
- TEST=scripttests
after_success: *coverage after_success: *coverage
- <<: *linux - <<: *linux
name: huge+coverage/gcc name: huge+coverage/gcc

View File

@@ -1,3 +1,11 @@
# Suppress leaks from X libraries on Ubuntu trusty. # Suppress leaks from X libraries on Ubuntu bionic.
leak:libX11.so.6 leak:libX11.so.6
leak:libXt.so.6 leak:libXt.so.6
leak:libcairo.so.2
leak:libfontconfig.so.1
leak:libglib-2.0.so.0
leak:libtinfo.so.5
# Suppress leaks from other language libraries.
leak:libperl.so.*
leak:libpython*.so.*
leak:libruby*.so.*

View File

@@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
481,
/**/ /**/
480, 480,
/**/ /**/