From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 6 Jun 2020 18:57:37 +0000 (+0200)
Subject: Upgrade Travis-CI environment to Ubuntu 18.04
X-Git-Tag: v4.0~420
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a855fc82e035c63523f92568d11c67d1fa1dc51;p=thirdparty%2Fccache.git

Upgrade Travis-CI environment to Ubuntu 18.04
---

diff --git a/.travis.yml b/.travis.yml
index e9f7e7aa1..af0cbb24f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: cpp
-dist: xenial
+dist: bionic
 
 script:
   - ./autogen.sh
@@ -30,6 +30,7 @@ matrix:
       apt:
         packages:
         - gcc-multilib
+        - g++-multilib
         - lib32stdc++-5-dev
 
   # Job 3: Build on Linux with native Clang
diff --git a/misc/install_cuda.sh b/misc/install_cuda.sh
index 1339d2383..b785e7372 100644
--- a/misc/install_cuda.sh
+++ b/misc/install_cuda.sh
@@ -8,9 +8,9 @@
 
 if [ -n "$CUDA" ]; then
     echo "Installing CUDA support"
-    travis_retry wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/cuda-repo-ubuntu1604_${CUDA}_amd64.deb
-    travis_retry sudo dpkg -i cuda-repo-ubuntu1604_${CUDA}_amd64.deb
-    # sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/7fa2af80.pub
+    travis_retry wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-repo-ubuntu1804_${CUDA}_amd64.deb
+    travis_retry sudo dpkg -i cuda-repo-ubuntu1804_${CUDA}_amd64.deb
+    travis_retry sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub
     travis_retry sudo apt-get update -qq
     export CUDA_APT=${CUDA:0:4}
     export CUDA_APT=${CUDA_APT/./-}