From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Thu, 3 Dec 2020 21:29:48 +0000 (-0800)
Subject: ci: update travis distro
X-Git-Tag: v28~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9928f44ed4b171c1fe432f961c2595105de8ca2;p=thirdparty%2Fkmod.git

ci: update travis distro

Don't bother with gcc 4.8 vs 4.9, just use the latest one for the
distro. Update travis to ubuntu 20.04 so we can get current
dependencies.
---

diff --git a/.travis.yml b/.travis.yml
index 0fcce14e..2adb3c62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,21 @@
 language: c
+dist: focal
 
 matrix:
   include:
     - compiler: gcc
-      env: MYCC=gcc
-    - compiler: gcc
-      env: MYCC=gcc-4.8
-    - compiler: gcc
-      env: MYCC=gcc-4.9
+      env: CC=gcc
     - compiler: clang
-      env: MYCC=clang
+      env: CC=clang
 
 before_install:
-  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
   - sudo apt-get update -qq
-  - sudo apt-get install -qq libzstd-dev
+  - sudo apt-get install -qq libzstd-dev zstd
   - sudo apt-get install -qq liblzma-dev
   - sudo apt-get install -qq zlib1g-dev
   - sudo apt-get install -qq xsltproc docbook-xsl
   - sudo apt-get install -qq cython
   - sudo apt-get install -qq linux-headers-generic
-  - if [ "$MYCC" = "gcc-4.8" ]; then sudo apt-get install -qq gcc-4.8; sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 90; gcc --version; fi
-  - if [ "$MYCC" = "gcc-4.9" ]; then sudo apt-get install -qq gcc-4.9; sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 90; gcc --version; fi
 
 before_script:
   - unset PYTHON_CFLAGS # hack to broken travis setup
@@ -29,7 +23,7 @@ before_script:
 
 script:
   - ./autogen.sh c --without-openssl && make -j
-  - if [ "$MYCC" != "gcc-4.8" ]; then make -j check; fi
+  - make -j check
 
 notifications:
   irc: