Upgrade Travis-CI environment to Ubuntu 18.04

diff --git a/.travis.yml b/.travis.yml
index e9f7e7aa1aca3fc998bc3466db5a78597e6843fb..af0cbb24fe437c3457d4f79b1a7ac3ffb3355982 100644 (file)
--- 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 1339d23837cc4fc097afbdfc6bfbf6fe597cb384..b785e73729558c7695273658394cb6421be0b0bb 100644 (file)
--- 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/./-}