summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernd Schubert <bschubert@ddn.com>2023-01-27 23:14:55 +0100
committerNikolaus Rath <Nikolaus@rath.org>2023-01-28 09:35:34 +0000
commite42b972271dfd70735eada21e7770a19effe7fd4 (patch)
tree8c99f6ced1613bec438f214861336a6c9a981fe1
parent19d95c0e701076407dc1f3cfd39e12e28b332927 (diff)
downloadfuse-e42b972271dfd70735eada21e7770a19effe7fd4.tar.gz
Update travis to ubuntu jammy (22.04)
A newer ubuntu version is required to get a more recent meson (at least 0.50 now)
-rw-r--r--.travis.yml11
-rwxr-xr-xtest/travis-build.sh2
2 files changed, 5 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index bcee2f2..0b5749c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,6 @@
sudo: required
-dist: bionic
+dist: jammy
-before_install:
- - curl https://spot.fedorapeople.org/spotfoss-ppa.key | sudo apt-key add -
- - wget https://launchpad.net/~spotfoss/+archive/ubuntu/ppa/+files/valgrind_3.16.1-2_amd64.deb
- - sudo apt install ./valgrind_3.16.1-2_amd64.deb
language:
- c
- c++
@@ -15,14 +11,15 @@ addons:
packages:
- doxygen
- clang
- - libstdc++-7-dev
+ - libstdc++-9-dev
- libstdc++-10-dev
- gcc
- - gcc-7
+ - gcc-9
- gcc-10
- python3-pip
- python3-setuptools
- ninja-build
+ - valgrind
install: test/travis-install.sh
script: test/travis-build.sh
diff --git a/test/travis-build.sh b/test/travis-build.sh
index 22b3e6a..f3a106a 100755
--- a/test/travis-build.sh
+++ b/test/travis-build.sh
@@ -24,7 +24,7 @@ export ASAN_OPTIONS="detect_leaks=1"
export CC
# Standard build
-for CC in gcc gcc-7 gcc-10 clang; do
+for CC in gcc gcc-9 gcc-10 clang; do
echo "=== Building with ${CC} ==="
mkdir build-${CC}; cd build-${CC}
if [ "${CC}" == "clang" ]; then