ci: consolidate

Author: scivision

.github/workflows/ci-nojvm.yml

@@ -19,10 +19,10 @@ concurrency:
 jobs:
 
   matlab-at-least-r2024a:
-    timeout-minutes: 15
+    timeout-minutes: &timeout 15
     runs-on: ${{ matrix.os }}
 
-    name: ${{ matrix.release }}-${{ matrix.os }}
+    name: &job-name ${{ matrix.release }}-${{ matrix.os }}
 
     strategy:
       matrix:
@@ -33,17 +33,21 @@ jobs:
 # macOS >= R2023b to be compatible with Xcode version on Github Actions runner
 
     steps:
-    - &checkout
-      uses: actions/checkout@v4
-
     - &matlab-install
-      uses: ./.github/workflows/composite-install-matlab
+      name: Install MATLAB
+      uses: matlab-actions/setup-matlab@v2
+      with:
+        release: ${{ matrix.release }}
+        cache: true
 
     - &mac-fc
       name: Fortran FC
       if: runner.os == 'macOS'
       run: echo "FC=gfortran-14" >> $GITHUB_ENV
 
+    - &checkout
+      uses: actions/checkout@v4
+
     - &tell-ext
       name: Matlab tell External Language Interface versions
       uses: matlab-actions/run-command@v2
@@ -65,32 +69,31 @@ jobs:
 
   matlab:
     needs: matlab-at-least-r2024a
-    timeout-minutes: 15
+    timeout-minutes:  *timeout
     runs-on: ${{ matrix.os }}
 
-    name: ${{ matrix.release }}-${{ matrix.os }}
+    name: *job-name
 
     strategy:
       matrix:
         os: [ubuntu-22.04, windows-latest]
         release: [R2022a, R2022b, R2023a, R2023b]
 
     steps:
-    - *checkout
     - *matlab-install
     - *mac-fc
+    - *checkout
     - *tell-ext
 
-    - *code-issues
     - *test-main
 
 
   matlab-less-than-R2022a:
     needs: matlab-at-least-r2024a
 
-    name: ${{ matrix.release }}-${{ matrix.os }}
+    name: *job-name
 
-    timeout-minutes: 15
+    timeout-minutes: *timeout
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -99,8 +102,30 @@ jobs:
         release: [R2021a, R2021b]
 
     steps:
+    - *matlab-install
     - *checkout
+    - *tell-ext
+
+    - *test-main
+
+
+  NoJVM:
+    timeout-minutes: *timeout
+
+    name: *job-name
+
+    strategy:
+      matrix:
+        os: [ubuntu-22.04, macos-latest, windows-latest]
+        release: [R2022b, R2025a]
+        startup-options: ["-nojvm"]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
     - *matlab-install
+    - *checkout
+    - *mac-fc
     - *tell-ext
 
     - *test-main

.github/workflows/ci.yml

@@ -3,7 +3,6 @@
 [![DOI](https://zenodo.org/badge/273830124.svg)](https://zenodo.org/badge/latestdoi/273830124)
 [![View stdlib for Matlab on File Exchange](https://www.mathworks.com/matlabcentral/images/matlab-file-exchange.svg)](https://www.mathworks.com/matlabcentral/fileexchange/78673-stdlib-for-matlab)
 [![ci](https://github.com/geospace-code/matlab-stdlib/actions/workflows/ci.yml/badge.svg)](https://github.com/geospace-code/matlab-stdlib/actions/workflows/ci.yml)
-[![ci-nojvm](https://github.com/geospace-code/matlab-stdlib/actions/workflows/ci-nojvm.yml/badge.svg)](https://github.com/geospace-code/matlab-stdlib/actions/workflows/ci-nojvm.yml)
 
 Matlab users coming from other languages will benefit from the functionality contained within this user-developed, unofficial "stdlib" standard library of functions.
 These system, filesystem, and HDF5 / HDF4 / NetCDF functions are used by numerous independent projects.