.travis.yml: Upgrade to Ubuntu Bionic 18.04.x LTS and Clang 11

This commit is contained in:
Sebastian Pipping 2021-02-23 22:04:20 +01:00
parent af86899bf9
commit 44d889e78c
3 changed files with 13 additions and 9 deletions

View file

@ -36,7 +36,7 @@ if [[ ${TRAVIS_OS_NAME} = osx ]]; then
export PATH="/usr/local/opt/coreutils/libexec/gnubin${PATH:+:}${PATH}"
export PATH="/usr/local/opt/findutils/libexec/gnubin${PATH:+:}${PATH}"
elif [[ ${TRAVIS_OS_NAME} = linux ]]; then
export PATH="/usr/lib/llvm-9/bin:${PATH}"
export PATH="/usr/lib/llvm-11/bin:${PATH}"
fi
echo "New \${PATH}:"

View file

@ -4,7 +4,7 @@
language: cpp
os:
- linux
dist: trusty
dist: bionic
git:
depth: 50
@ -57,11 +57,13 @@ addons:
brewfile: true
apt:
sources:
- llvm-toolchain-trusty
- sourceline: "deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main"
key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
- ubuntu-toolchain-r-test
packages:
- clang-9
- clang-format-9
# NOTE: Please note the version-specific ${PATH} extension for clang in .travis.sh
- clang-11
- clang-format-11
- cmake
- cppcheck
- docbook2x
@ -71,7 +73,8 @@ addons:
- lzip
- mingw-w64
- moreutils
- wine
- wine-stable
- wine32
script:
- ./.travis.sh

View file

@ -126,12 +126,13 @@ run_tests() {
esac
if [[ ${CC} =~ mingw ]]; then
# NOTE: Filenames are hardcoded for Travis Ubuntu trusty, as of now
# NOTE: Filenames are hardcoded for Travis' Ubuntu Bionic, as of now
for i in tests xmlwf ; do
mingw32_dir="$(ls -1d /usr/lib/gcc/i686-w64-mingw32/* | head -n1)"
RUN ln -s \
/usr/i686-w64-mingw32/lib/libwinpthread-1.dll \
/usr/lib/gcc/i686-w64-mingw32/*/libgcc_s_sjlj-1.dll \
/usr/lib/gcc/i686-w64-mingw32/*/libstdc++-6.dll \
"${mingw32_dir}"/libgcc_s_sjlj-1.dll \
"${mingw32_dir}"/libstdc++-6.dll \
"$PWD"/libexpat{,w}.dll \
${i}/
done