merged changes for CI

.github/workflows/build-and-test-callable.yml

@@ -34,10 +34,10 @@ on:
         default: false
       cuda-toolkit-version:
         type: string
-        default: '12.4.1'
+        default: '12.6.0'
       cuda-driver-version:
         type: string
-        default: '550.54.15'
+        default: '560.28.03'
       libceed:
         description: 'Build with libCEED'
         type: boolean
@@ -64,8 +64,7 @@ jobs:
       ${{ inputs.cuda && '| cuda' || '' }}${{ inputs.libceed && '| libceed' || '' }}${{ inputs.gslib && '| gslib' || '' }}
 
     env:
-      cuda-toolkit-version: '12.4.1'
-      cuda-driver-version: '550.54.15'
+      CUDA_HOME: '/usr/local/cuda'
       # These are all passed to setup.py as one concatenated string
       build-flags: >-
         ${{ inputs.parallel && '--with-parallel' || '' }}
@@ -108,12 +107,12 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/cache
-        key: cuda-installer-${{ env.cuda-toolkit-version }}-${{ env.cuda-driver-version }}
+        key: cuda-installer-${{ inputs.cuda-toolkit-version }}-${{ inputs.cuda-driver-version }}
 
     - name: Download CUDA
       if: inputs.cuda && steps.cache-cuda.outputs.cache-hit == false
       run: |
-        CUDA_URL="https://developer.download.nvidia.com/compute/cuda/${{ env.cuda-toolkit-version }}/local_installers/cuda_${{ env.cuda-toolkit-version }}_${{ env.cuda-driver-version }}_linux.run"
+        CUDA_URL="https://developer.download.nvidia.com/compute/cuda/${{ inputs.cuda-toolkit-version }}/local_installers/cuda_${{ inputs.cuda-toolkit-version }}_${{ inputs.cuda-driver-version }}_linux.run"
         curl -o ~/cache/cuda.run --create-dirs $CUDA_URL
 
     - name: Install CUDA

.github/workflows/build-and-test-dispatch.yml

@@ -25,7 +25,7 @@ jobs:
   # Build and test whole matrix of options on linux
   # -------------------------------------------------------------------------------------------------
   test-linux-serial:
-    if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' }}
+    if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' }}
     strategy:
       fail-fast: false
       matrix:
@@ -41,7 +41,7 @@ jobs:
       parallel: ${{ matrix.parallel }}
 
   test-linux-parallel:
-    if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' }}
+    if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' }}
     strategy:
       fail-fast: false
       matrix:
@@ -78,7 +78,7 @@ jobs:
   # Specific cases (we want these to use defaults, and not expand the dimensions of the matrix)
   # -------------------------------------------------------------------------------------------------
   test-macos:
-    if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' }}
+    if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' }}
     strategy:
       fail-fast: false
       matrix:
@@ -90,21 +90,21 @@ jobs:
       mfem-branch: ${{ matrix.mfem-branch }}
 
   test-cuda:
-    if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' || inputs.test_options == 'cuda'}}
+    if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' || inputs.test_options == 'cuda'}}
     uses: ./.github/workflows/build-and-test-callable.yml
     with:
       cuda: true
     name: test-cuda
 
   test-libceed:
-    if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' || inputs.test_options == 'libceed'}}
+    if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' || inputs.test_options == 'libceed'}}
     uses: ./.github/workflows/build-and-test-callable.yml
     with:
       libceed: true
     name: test-libceed
 
   test-gslib:
-    if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' || inputs.test_options == 'gslib'}}
+    if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' || inputs.test_options == 'gslib'}}
     uses: ./.github/workflows/build-and-test-callable.yml
     with:
       gslib: true