Update to newer CI environment.

The current one causes build failures since recent pytest versions are incompatble with
Python 3.5.
This commit is contained in:
Nikolaus Rath 2021-01-19 10:16:41 +00:00
parent dfd4cba385
commit d18869a307
3 changed files with 7 additions and 14 deletions

View File

@ -1,21 +1,21 @@
sudo: required
dist: xenial
dist: focal
sudo: enabled
language:
- c
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- valgrind
- clang
- gcc
- gcc-6
- clang
- python-docutils
- python3-pip
- python3-setuptools
- ninja-build
- meson
- python3-pytest
- libglib2.0-dev
install: test/travis-install.sh
script: test/travis-build.sh

View File

@ -12,7 +12,7 @@ export CC
TEST_CMD="python3 -m pytest --maxfail=99 test/"
# Standard build with Valgrind
for CC in gcc gcc-6 clang; do
for CC in gcc clang; do
mkdir build-${CC}; cd build-${CC}
if [ ${CC} == 'gcc-6' ]; then
build_opts='-D b_lundef=false'

View File

@ -2,19 +2,12 @@
set -e
# Meson 0.45 requires Python 3.5 or newer
sudo python3 -m pip install pytest meson==0.44
valgrind --version
ninja --version
meson --version
# Install fuse
wget https://github.com/libfuse/libfuse/archive/master.zip
unzip master.zip
cd libfuse-master
mkdir build
cd build
export CC=gcc-6
meson ..
ninja
sudo ninja install