From 928c5948bdc5ab1fde76c77021e31a0b2204d2f9 Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Fri, 21 Aug 2020 14:16:47 +0200
Subject: [PATCH] build.yaml: Make installation of CUDA actually work

---
 .github/workflows/build.yaml |  4 +++-
 ci/install-cuda              | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100755 ci/install-cuda

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c115f326d..0d943aca8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -193,7 +193,9 @@ jobs:
 
     - name: Install CUDA
       if: matrix.config.CUDA != ''
-      run: sudo sh ./ci/install-cuda.sh
+      run: sudo --preserve-env=CUDA ci/install-cuda
+      env:
+        CUDA: ${{ matrix.config.CUDA }}
 
     - name: Run Apt-Get
       if: matrix.config.apt_get != ''
diff --git a/ci/install-cuda b/ci/install-cuda
new file mode 100755
index 000000000..97f098dff
--- /dev/null
+++ b/ci/install-cuda
@@ -0,0 +1,32 @@
+#!/bin/bash
+#
+# Version is given in the CUDA variable.
+
+set -eu
+
+retry() {
+    local i=0
+    while [ $i -lt 3 ]; do
+        if "$@"; then
+            return 0
+        fi
+        i=$((i + 1))
+    done
+    return 1
+}
+
+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 http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub
+retry sudo apt-get update -qq
+
+cuda_prefix=${CUDA:0:4}
+cuda_prefix=${cuda_prefix/./-}
+retry sudo apt-get install --allow-unauthenticated -y cuda-command-line-tools-${cuda_prefix}
+retry sudo apt-get clean
+
+cuda_home=/usr/local/cuda-${CUDA:0:4}
+$cuda_home/bin/nvcc --version
+echo "::set-env name=PATH::${cuda_home}/bin:${PATH}"
-- 
2.47.3