From a682252be78e09f55925e36775ff5818a26b5172 Mon Sep 17 00:00:00 2001
From: Pierce Freeman <piercefreeman@gmail.com>
Date: Fri, 2 Jun 2023 18:47:25 -0700
Subject: [PATCH] OS version build numbers

---
 .github/workflows/cuda/cu102-Linux.sh |  4 +++-
 .github/workflows/cuda/cu113-Linux.sh |  8 +++++++-
 .github/workflows/cuda/cu116-Linux.sh |  4 +++-
 .github/workflows/publish.yml         | 17 +++++++++++------
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/cuda/cu102-Linux.sh b/.github/workflows/cuda/cu102-Linux.sh
index 46fb053..82729ad 100644
--- a/.github/workflows/cuda/cu102-Linux.sh
+++ b/.github/workflows/cuda/cu102-Linux.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-OS=ubuntu1804
+# Strip the periods from the version number
+OS_VERSION=$(echo $OS_VERSION | tr -d .)
+OS=ubuntu${OS_VERSION}
 
 wget -nv https://developer.download.nvidia.com/compute/cuda/repos/${OS}/x86_64/cuda-${OS}.pin
 sudo mv cuda-${OS}.pin /etc/apt/preferences.d/cuda-repository-pin-600
diff --git a/.github/workflows/cuda/cu113-Linux.sh b/.github/workflows/cuda/cu113-Linux.sh
index b89a7fb..65e6d39 100644
--- a/.github/workflows/cuda/cu113-Linux.sh
+++ b/.github/workflows/cuda/cu113-Linux.sh
@@ -1,11 +1,17 @@
 #!/bin/bash
 
-OS=ubuntu1804
+# Strip the periods from the version number
+OS_VERSION=$(echo $OS_VERSION | tr -d .)
+OS=ubuntu${OS_VERSION}
 
 wget -nv https://developer.download.nvidia.com/compute/cuda/repos/${OS}/x86_64/cuda-${OS}.pin
 sudo mv cuda-${OS}.pin /etc/apt/preferences.d/cuda-repository-pin-600
 wget -nv https://developer.download.nvidia.com/compute/cuda/11.3.0/local_installers/cuda-repo-${OS}-11-3-local_11.3.0-465.19.01-1_amd64.deb
 sudo dpkg -i cuda-repo-${OS}-11-3-local_11.3.0-465.19.01-1_amd64.deb
+
+# TODO: If on version < 22.04, install via signal-desktop-keyring
+# For future versions it's deprecated and should be moved into the trusted folder
+# sudo mv /var/cuda-repo-${OS}-11-3-local/7fa2af80.pub /etc/apt/trusted.gpg.d/
 sudo apt-key add /var/cuda-repo-${OS}-11-3-local/7fa2af80.pub
 
 sudo apt-get -qq update
diff --git a/.github/workflows/cuda/cu116-Linux.sh b/.github/workflows/cuda/cu116-Linux.sh
index e3e4e2a..c49f604 100644
--- a/.github/workflows/cuda/cu116-Linux.sh
+++ b/.github/workflows/cuda/cu116-Linux.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-OS=ubuntu1804
+# Strip the periods from the version number
+OS_VERSION=$(echo $OS_VERSION | tr -d .)
+OS=ubuntu${OS_VERSION}
 
 wget -nv https://developer.download.nvidia.com/compute/cuda/repos/${OS}/x86_64/cuda-${OS}.pin
 sudo mv cuda-${OS}.pin /etc/apt/preferences.d/cuda-repository-pin-600
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index f74ef75..36e990a 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -37,12 +37,15 @@ jobs:
       fail-fast: false
       matrix:
           os: [ubuntu-20.04, ubuntu-22.04]
-          python-version: ['3.7', '3.8', '3.9', '3.10']
-          torch-version: [1.11.0, 1.12.0, 1.12.1]
-          cuda-version: ['113', '116']
-          exclude:
-            - torch-version: 1.11.0
-              cuda-version: '116'
+          #python-version: ['3.7', '3.8', '3.9', '3.10']
+          python-version: ['3.10']
+          torch-version: [1.11.0]
+          cuda-version: ['113']
+          #torch-version: [1.11.0, 1.12.0, 1.12.1]
+          #cuda-version: ['113', '116']
+          #exclude:
+          #  - torch-version: 1.11.0
+          #    cuda-version: '116'
 
     steps:
       - name: Checkout
@@ -65,6 +68,8 @@ jobs:
 
       - name: Install CUDA ${{ matrix.cuda-version }}
         if: ${{ matrix.cuda-version != 'cpu' }}
+        env:
+          OS_VERSION: ${{ runner.release }}
         run: |
           bash .github/workflows/cuda/cu${{ matrix.cuda-version }}-${{ runner.os }}.sh
         shell: