From 609747e770a1ea8a59c7b3d9b6760eb5ef58ef32 Mon Sep 17 00:00:00 2001
From: Peter Heywood <peethwd@gmail.com>
Date: Thu, 22 Aug 2024 14:23:59 +0100
Subject: [PATCH] CI: regular CI matrix update to include CUDA 12.6

The regular linux and windows workflows now include:

+ Latest CUDA (12.6)
  + release no vis
  + release vis
  + beltsoff no vis
  + beltsoff vis
+ CUDA 12.0
  + release no vis
+ CUDA 11.8
  + release no vis
  + release vis
+ CUDA 11.0
  + release no vis

This is a compromise to cover a wider set of configurations, without increasing CI demand too much
---
 .github/scripts/install_cuda_windows.ps1 |  7 +++++++
 .github/workflows/Ubuntu.yml             | 17 ++++++++++++++---
 .github/workflows/Windows.yml            | 17 ++++++++++++++---
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/.github/scripts/install_cuda_windows.ps1 b/.github/scripts/install_cuda_windows.ps1
index 5fc57fe6d..8df59fc48 100755
--- a/.github/scripts/install_cuda_windows.ps1
+++ b/.github/scripts/install_cuda_windows.ps1
@@ -47,6 +47,13 @@ $CUDA_KNOWN_URLS = @{
     "12.2.1" = "https://developer.download.nvidia.com/compute/cuda/12.2.1/network_installers/cuda_12.2.1_windows_network.exe";
     "12.2.2" = "https://developer.download.nvidia.com/compute/cuda/12.2.2/network_installers/cuda_12.2.2_windows_network.exe";
     "12.3.0" = "https://developer.download.nvidia.com/compute/cuda/12.3.0/network_installers/cuda_12.3.0_windows_network.exe";
+    "12.3.1" = "https://developer.download.nvidia.com/compute/cuda/12.3.1/network_installers/cuda_12.3.1_windows_network.exe";
+    "12.3.2" = "https://developer.download.nvidia.com/compute/cuda/12.3.2/network_installers/cuda_12.3.2_windows_network.exe";
+    "12.4.0" = "https://developer.download.nvidia.com/compute/cuda/12.4.0/network_installers/cuda_12.4.0_windows_network.exe";
+    "12.4.1" = "https://developer.download.nvidia.com/compute/cuda/12.4.1/network_installers/cuda_12.4.1_windows_network.exe";
+    "12.5.0" = "https://developer.download.nvidia.com/compute/cuda/12.5.0/network_installers/cuda_12.5.0_windows_network.exe";
+    "12.5.1" = "https://developer.download.nvidia.com/compute/cuda/12.5.1/network_installers/cuda_12.5.1_windows_network.exe";
+    "12.6.0" = "https://developer.download.nvidia.com/compute/cuda/12.6.0/network_installers/cuda_12.6.0_windows_network.exe";
 }
 
 # @todo - change this to be based on _MSC_VER intead, or invert it to be CUDA keyed instead
diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml
index 646e33a6c..9b4392838 100644
--- a/.github/workflows/Ubuntu.yml
+++ b/.github/workflows/Ubuntu.yml
@@ -29,7 +29,11 @@ jobs:
       # optional exclude: can be partial, include: must be specific
       matrix:
         cudacxx:
-          - cuda: "12.3"
+          - cuda: "12.6"
+            cuda_arch: "50"
+            hostcxx: gcc-12
+            os: ubuntu-22.04
+          - cuda: "12.0"
             cuda_arch: "50"
             hostcxx: gcc-12
             os: ubuntu-22.04
@@ -54,11 +58,18 @@ jobs:
           - "ON"
           - "OFF"
         exclude:
-          # Exclude VIS=ON for oldest cuda.
+          # Exclude VIS=ON for oldest cuda of each major version
+          - cudacxx:
+              cuda: "12.0"
+            VISUALISATION: "ON"
           - cudacxx:
               cuda: "11.0"
             VISUALISATION: "ON"
-          # Exclude beltsoff builds for old cuda's
+          # Exclude beltsoff builds for all but the most recent cuda
+          - cudacxx:
+              cuda: "12.0"
+            config:
+              name: "Beltsoff"
           - cudacxx:
               cuda: "11.8"
             config:
diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml
index c3bf596fa..ac11b673e 100644
--- a/.github/workflows/Windows.yml
+++ b/.github/workflows/Windows.yml
@@ -29,7 +29,11 @@ jobs:
       # optional exclude: can be partial, include: must be specific
       matrix:
         cudacxx:
-          - cuda: "12.3.0"
+          - cuda: "12.6.0"
+            cuda_arch: "50"
+            hostcxx: "Visual Studio 17 2022"
+            os: windows-2022
+          - cuda: "12.0.0"
             cuda_arch: "50"
             hostcxx: "Visual Studio 17 2022"
             os: windows-2022
@@ -54,11 +58,18 @@ jobs:
           - "ON"
           - "OFF"
         exclude:
-          # Exclude VIS=ON for oldest cuda.
+          # Exclude VIS=ON for oldest cuda of each major version
+          - cudacxx:
+              cuda: "12.0.0"
+            VISUALISATION: "ON"
           - cudacxx:
               cuda: "11.0.3"
             VISUALISATION: "ON"
-          # Exclude beltsoff builds for old cuda's
+          # Exclude beltsoff builds for all but the most recent cuda
+          - cudacxx:
+              cuda: "12.0.0"
+            config:
+              name: "Beltsoff"
           - cudacxx:
               cuda: "11.8.0"
             config: