Skip to content

Commit c0bc576

Browse files
committed
ci: remove -nojvm
1 parent 05b9793 commit c0bc576

File tree

4 files changed

+23
-46
lines changed

4 files changed

+23
-46
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
strategy:
2828
matrix:
29-
os: [ubuntu-22.04, windows-2025, macos-latest]
29+
os: [ubuntu-latest, windows-2025, macos-latest]
3030
release: [R2024a, R2024b, R2025a]
3131
# on Linux, even R2025a needs GCC 10.x and hence Github Actions runner ubuntu-22.04.
3232
# R2021a...R2022a officially need Ubuntu 20.04, which is no longer available on Github Actions
@@ -43,10 +43,10 @@ jobs:
4343
- &mac-fc
4444
name: Fortran FC
4545
if: runner.os == 'macOS'
46-
run: echo "FC=gfortran-14" >> $GITHUB_ENV
46+
run: echo "FC=gfortran-15" >> $GITHUB_ENV
4747

4848
- &checkout
49-
uses: actions/checkout@v4
49+
uses: actions/checkout@v5
5050

5151
- &tell-ext
5252
name: Matlab tell External Language Interface versions
@@ -107,25 +107,3 @@ jobs:
107107
- *tell-ext
108108

109109
- *test-main
110-
111-
112-
NoJVM:
113-
timeout-minutes: *timeout
114-
115-
name: *job-name
116-
117-
strategy:
118-
matrix:
119-
os: [ubuntu-22.04, macos-latest, windows-latest]
120-
release: [R2022b, R2025a]
121-
startup-options: ["-nojvm"]
122-
123-
runs-on: ${{ matrix.os }}
124-
125-
steps:
126-
- *matlab-install
127-
- *checkout
128-
- *mac-fc
129-
- *tell-ext
130-
131-
- *test-main

.github/workflows/composite-nomex/action.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,44 @@ runs:
1010
if: ${{ matrix.release >= 'R2024b' }}
1111
uses: matlab-actions/run-build@v2
1212
with:
13-
startup-options: ${{ matrix.startup-options }}
1413
tasks: test:main
1514

1615

1716
- name: Main Tests (< R2024b)
1817
if: ${{ matrix.release >= 'R2022b' && matrix.release < 'R2024b' }}
1918
uses: matlab-actions/run-build@v2
2019
with:
21-
startup-options: ${{ matrix.startup-options }}
2220
tasks: test_main
2321

2422

25-
- name: Java Test
26-
if: ${{ !contains(matrix.startup-options, '-nojvm') && matrix.release >= 'R2024b' }}
23+
- name: Java, JavaExe Test
24+
if: ${{ matrix.release >= 'R2024b' }}
2725
uses: matlab-actions/run-build@v2
2826
with:
29-
startup-options: ${{ matrix.startup-options }}
3027
tasks: test:java test:java_exe
3128

3229

33-
- name: Java Test (R2023b..R2024a)
34-
if: ${{ !contains(matrix.startup-options, '-nojvm') && matrix.release >= 'R2023b' && matrix.release < 'R2024b' }}
30+
- name: Java Test (R2022b..R2024a)
31+
if: ${{ matrix.release >= 'R2022b' && matrix.release < 'R2024b' }}
32+
uses: matlab-actions/run-build@v2
33+
with:
34+
tasks: test_java
35+
36+
37+
- name: JavaExe Test (R2023b..R2024a)
38+
if: ${{ matrix.release >= 'R2023b' && matrix.release < 'R2024b' }}
3539
uses: matlab-actions/run-build@v2
3640
with:
37-
startup-options: ${{ matrix.startup-options }}
38-
tasks: test_java test_java_exe
41+
tasks: test_java_exe
3942

4043

4144
- name: Exe Test (>= R2024b)
4245
if: ${{ matrix.release >= 'R2024b' }}
4346
uses: matlab-actions/run-build@v2
4447
with:
45-
startup-options: -logfile ${{ matrix.release }}-${{ runner.os }}-test.log
4648
tasks: test:exe
49+
startup-options: -logfile ${{ matrix.release }}-${{ runner.os }}-test.log
50+
4751

4852
- name: Exe Test (legacy)
4953
if: ${{ matrix.release >= 'R2023b' && matrix.release < 'R2024b' }}
@@ -53,14 +57,15 @@ runs:
5357
tasks: test_exe
5458

5559

60+
5661
# note: "source-folder" adds all subfolders to Matlab path
5762
# https://github.com/matlab-actions/run-tests?tab=readme-ov-file#run-matlab-tests
5863
- name: Non-buildtool tests (< R2022b)
5964
if: ${{ matrix.release < 'R2022b' }}
6065
uses: matlab-actions/run-command@v2
6166
with:
62-
command: test_main
6367
startup-options: -logfile ${{ matrix.release }}-${{ runner.os }}-test.log
68+
command: test_main
6469

6570
- name: upload logfile
6671
if: ${{ hashFiles(matrix.release-runner.os-test.log) != '' }}

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
name: github-pages
3737
url: ${{ steps.deployment.outputs.page_url }}
3838

39-
runs-on: ubuntu-22.04
39+
runs-on: ubuntu-latest
4040

4141
steps:
42-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@v5
4343

4444
- name: Setup Pages
4545
uses: actions/configure-pages@v5

Readme_java.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,9 @@ Get the Java version:
3434
stdlib.java_version()
3535
```
3636

37-
From before Matlab R2019b to at least Matlab R2025a, the Matlab factory Java version is 1.8, which is adequate for most Matlab-stdlib functionality.
37+
Matlab factory Java version 1.8 is adequate for all Matlab-stdlib functionality.
3838

39-
Java won't be available if Matlab was started with
40-
[-nojvm](https://www.mathworks.com/help/matlab/matlab_env/commonly-used-startup-options.html).
41-
This
42-
[CI job](https://github.com/geospace-code/matlab-stdlib/actions/workflows/ci-nojvm.yml)
43-
tests without Java.
44-
45-
If desired (not used by Matlab-stdlib), one can use non-factory Java classes in
39+
As general information (not used by Matlab-stdlib), non-factory Java classes can be used in
4640
[Matlab](https://www.mathworks.com/help/matlab/matlab_external/static-path-of-java-class-path.html).
4741

4842
## Configure Matlab JVM

0 commit comments

Comments
 (0)