github: attempt to fix CI GPU builds

Author: mmp

.github/workflows/ci-gpu.yml

@@ -24,7 +24,20 @@ jobs:
       matrix:
         optix: [ optix-7.7.0, optix-8.1.0, optix-9.0.0 ]
         cuda: [ '12.6.3', '12.8.0', '12.9.1', '13.0.1', '13.1.1', '13.2.0' ]
-        os: [ ubuntu-24.04, windows-latest ]
+        os: [ ubuntu-22.04, ubuntu-24.04, windows-latest ]
+        exclude:
+          - os: ubuntu-24.04
+            cuda: '12.6.3'
+          - os: ubuntu-24.04
+            cuda: '12.8.0'
+          - os: ubuntu-22.04
+            cuda: '12.9.1'
+          - os: ubuntu-22.04
+            cuda: '13.0.1'
+          - os: ubuntu-22.04
+            cuda: '13.1.1'
+          - os: ubuntu-22.04
+            cuda: '13.2.0'
         include:
           - os: windows-latest
             cuda: '13.2.0'
@@ -74,7 +87,7 @@ jobs:
         choco install pkgconfiglite
 
     - name: Install OpenGL
-      if: ${{ matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-24.04' }}
+      if: ${{ startsWith(matrix.os, 'ubuntu-') }}
       run: |
         sudo apt-get update
         sudo apt-get install -y --no-install-recommends libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libxext-dev libxfixes-dev libgl1-mesa-dev libwayland-bin libwayland-dev wayland-protocols libxkbcommon-dev libxkbcommon-x11-0
@@ -83,10 +96,11 @@ jobs:
       if: ${{ matrix.os == 'windows-latest' }}
       run: |
         cd build
-        cmake .. -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT"/scripts/buildsystems/vcpkg.cmake -DPBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES=True -DPBRT_OPTIX_PATH=../optix/${{ matrix.optix }} -DPBRT_GPU_SHADER_MODEL=sm_80
+        $env:CUDACXX = "$env:CUDA_PATH\bin\nvcc.exe"
+        cmake .. -T "cuda=$env:CUDA_PATH" -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT"/scripts/buildsystems/vcpkg.cmake -DPBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES=True -DPBRT_OPTIX_PATH=../optix/${{ matrix.optix }} -DPBRT_GPU_SHADER_MODEL=sm_80
 
     - name: Configure (Linux)
-      if: ${{ matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-24.04' }}
+      if: ${{ startsWith(matrix.os, 'ubuntu-') }}
       run: |
         cd build
         cmake .. -DPBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES=True -DPBRT_OPTIX_PATH=../optix/${{ matrix.optix }} -DPBRT_GPU_SHADER_MODEL=sm_80
@@ -102,4 +116,3 @@ jobs:
         name: pbrt.exe
         path: build/Release/pbrt.exe
 
-