updates

ASML-Labs · Aug 15, 2024 · ab53a42 · ab53a42
1 parent 9277c9b
commit ab53a42
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/run-tests-dispatch.yml b/.github/workflows/run-tests-dispatch.yml
@@ -9,14 +9,13 @@ on:
         type: choice
         options:
           - 'windows-latest'
-          - 'ubuntu-20.04'
+          - 'ubuntu-24.04'
           - 'macos-latest'
       matlab-version:
         required: true
         description: "MATLAB version"
         type: choice
         options:
-          - 'R2021a'
           - 'R2021b'
           - 'R2022a'
           - 'R2022b'

diff --git a/.github/workflows/run-tests-reusable.yml b/.github/workflows/run-tests-reusable.yml
@@ -21,12 +21,11 @@ on:
 
 
 env:
-  GCC_VERSION: ${{ startsWith(inputs.matlab-version, 'R2021') && '8' || '9' }}
-  UBUNTU_VERSION: ${{ startsWith(inputs.matlab-version, 'R2021') && 'ubuntu-20.04' || 'ubuntu-24.04' }}
+  GCC_VERSION: ${{ startsWith(inputs.matlab-version, 'R2021') && '8' || (startsWith(inputs.matlab-version, 'R2022') && '9' || '10') }}
 
 jobs:
   test:
-    runs-on: ${{ startsWith(inputs.os, 'ubuntu') && env.UBUNTU_VERSION || inputs.os }}
+    runs-on: ${{ (startsWith(inputs.os, 'ubuntu') && startsWith(inputs.matlab-version, 'R2021')) && 'ubuntu-20.04' || inputs.os }}
     name: ${{ inputs.os }}-${{ inputs.matlab-version }}-${{ inputs.julia-version }}
     steps:
 

diff --git a/.github/workflows/run-tests-ubuntu.yml b/.github/workflows/run-tests-ubuntu.yml
@@ -14,6 +14,6 @@ jobs:
         matlab-version: ['R2021b', 'R2022b', 'R2023b']
         julia-version: ['1.7', '1.8', '1.9', '1.10']
     with:
-      os: ubuntu-20.04
+      os: ubuntu-24.04
       matlab-version: ${{ matrix.matlab-version }}
       julia-version: ${{ matrix.julia-version }}