Merge pull request #501 from CGarces/patch-1

Partial fix of Travis build on kernel >=5.4
This commit is contained in:
Christian Bremvåg 2019-12-18 21:27:17 +01:00 committed by GitHub
commit f01fb6e437
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,7 +1,7 @@
language: c language: c
compiler: gcc compiler: gcc
sudo: required sudo: required
dist: xenial dist: bionic
before_install: before_install:
- export ALL_DEB=$(wget --quiet -O - ${KERNEL_URL}v${KVER}/ | grep -o 'href=".*"' | grep -m1 all | cut -d '"' -f 2) - export ALL_DEB=$(wget --quiet -O - ${KERNEL_URL}v${KVER}/ | grep -o 'href=".*"' | grep -m1 all | cut -d '"' -f 2)
@ -22,48 +22,38 @@ matrix:
addons: addons:
apt: apt:
sources: sources:
- sourceline: 'ppa:ondrej/nginx-mainline' - ubuntu-toolchain-r-test
packages: packages:
- libssl1.1 - gcc-8
env: COMPILER=gcc-5 KVER=5.4.4 env: COMPILER=gcc-8 KVER=5.4.4
- compiler: gcc
env: COMPILER=gcc-7 KVER=5.4.4
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- sourceline: 'ppa:ondrej/nginx-mainline'
packages: packages:
- gcc-6 - gcc-6
- libssl1.1
env: COMPILER=gcc-6 KVER=5.4.4 env: COMPILER=gcc-6 KVER=5.4.4
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- sourceline: 'ppa:ondrej/nginx-mainline'
packages: packages:
- gcc-7 - gcc-8
- libssl1.1 env: COMPILER=gcc-8 KVER=4.19.86
env: COMPILER=gcc-7 KVER=5.4.4
- compiler: gcc - compiler: gcc
addons: env: COMPILER=gcc-7 KVER=4.19.86
apt:
sources:
- sourceline: 'ppa:ondrej/nginx-mainline'
packages:
- libssl1.1
env: COMPILER=gcc-5 KVER=4.19.67
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- sourceline: 'ppa:ondrej/nginx-mainline'
packages: packages:
- gcc-6 - gcc-6
- libssl1.1 env: COMPILER=gcc-6 KVER=4.19.86
env: COMPILER=gcc-6 KVER=4.19.67
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
@ -72,15 +62,4 @@ matrix:
- sourceline: 'ppa:ondrej/nginx-mainline' - sourceline: 'ppa:ondrej/nginx-mainline'
packages: packages:
- gcc-7 - gcc-7
- libssl1.1
env: COMPILER=gcc-7 KVER=4.19.67
- compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- sourceline: 'ppa:ondrej/nginx-mainline'
packages:
- gcc-7
- libssl1.1
env: COMPILER=gcc-7 KVER=4.15.18 env: COMPILER=gcc-7 KVER=4.15.18