From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 8 Jun 2022 13:08:47 +0000 (+0200)
Subject: ci: Bump CUDA job to Ubuntu 20.04
X-Git-Tag: v4.7~199
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1796f422928c3e1abbb437ddd119b1d7c2c5517e;p=thirdparty%2Fccache.git

ci: Bump CUDA job to Ubuntu 20.04
---

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0ca55415e..f5495a35b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -174,12 +174,12 @@ jobs:
             apt_get: elfutils gcc-multilib g++-multilib lib32stdc++-5-dev
 
           - name: Linux GCC CUDA
-            os: ubuntu-18.04
+            os: ubuntu-20.04
             CC: gcc
             CXX: g++
             CMAKE_PARAMS: -DCMAKE_BUILD_TYPE=CI -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON
             ENABLE_CACHE_CLEANUP_TESTS: 1
-            CUDA: 10.1.243-1
+            CUDA: 11.7.0-1
             apt_get: elfutils libzstd-dev
 
           - name: Linux MinGW 32-bit
diff --git a/ci/install-cuda b/ci/install-cuda
index 1e51b035b..daba29cba 100755
--- a/ci/install-cuda
+++ b/ci/install-cuda
@@ -17,9 +17,8 @@ retry() {
 
 echo "Installing CUDA support"
 
-retry wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-repo-ubuntu1804_${CUDA}_amd64.deb
-retry sudo dpkg -i cuda-repo-ubuntu1804_${CUDA}_amd64.deb
-retry sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
+retry wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-keyring_1.0-1_all.deb
+sudo dpkg -i cuda-keyring_1.0-1_all.deb
 retry sudo apt-get update -qq
 
 cuda_prefix=${CUDA:0:4}