Skip to content

Commit 4e4090c

Browse files
committed
buildfile default
1 parent 08db927 commit 4e4090c

File tree

3 files changed

+18
-25
lines changed

3 files changed

+18
-25
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,6 @@ jobs:
5454
- name: Main Tests
5555
uses: ./.github/workflows/composite-nomex
5656

57-
# - name: Mex & Exe Test (>= R2024b)
58-
# if: ${{ matrix.release >= 'R2024b' }}
59-
# uses: matlab-actions/run-build@v2
60-
# with:
61-
# startup-options: -logfile ${{ matrix.release }}-${{ runner.os }}-test.log
62-
# tasks: test:mex test:exe
63-
64-
- name: Exe Test (legacy)
65-
if: ${{ matrix.release >= 'R2023a' && matrix.release < 'R2024b' }}
66-
uses: matlab-actions/run-build@v2
67-
with:
68-
startup-options: -logfile ${{ matrix.release }}-${{ runner.os }}-test.log
69-
tasks: test_exe
70-
7157

7258
matlab:
7359
needs: matlab-at-least-r2024a
@@ -98,14 +84,6 @@ jobs:
9884
- name: Main Tests
9985
uses: ./.github/workflows/composite-nomex
10086

101-
- name: Exe Test (legacy)
102-
if: ${{ matrix.release >= 'R2023a' && matrix.release < 'R2024b' }}
103-
uses: matlab-actions/run-build@v2
104-
with:
105-
startup-options: -logfile ${{ matrix.release }}-${{ runner.os }}-test.log
106-
tasks: test_exe
107-
108-
10987

11088
matlab-less-than-R2022a:
11189
needs: matlab-at-least-r2024a

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,29 @@ runs:
3030
tasks: test:java test:java_exe
3131

3232

33-
- name: Java Test (< R2024b)
34-
if: ${{ !contains(matrix.startup-options, '-nojvm') && matrix.release >= 'R2022b' && matrix.release < 'R2024b' }}
33+
- name: Java Test (R2023b..R2024a)
34+
if: ${{ !contains(matrix.startup-options, '-nojvm') && matrix.release >= 'R2023b' && matrix.release < 'R2024b' }}
3535
uses: matlab-actions/run-build@v2
3636
with:
3737
startup-options: ${{ matrix.startup-options }}
3838
tasks: test_java
3939

4040

41+
- name: Exe Test (>= R2024b)
42+
if: ${{ matrix.release >= 'R2024b' }}
43+
uses: matlab-actions/run-build@v2
44+
with:
45+
startup-options: -logfile ${{ matrix.release }}-${{ runner.os }}-test.log
46+
tasks: test:exe
47+
48+
- name: Exe Test (legacy)
49+
if: ${{ matrix.release >= 'R2023b' && matrix.release < 'R2024b' }}
50+
uses: matlab-actions/run-build@v2
51+
with:
52+
startup-options: -logfile ${{ matrix.release }}-${{ runner.os }}-test.log
53+
tasks: test_exe
54+
55+
4156
# note: "source-folder" adds all subfolders to Matlab path
4257
# https://github.com/matlab-actions/run-tests?tab=readme-ov-file#run-matlab-tests
4358
- name: Non-buildtool tests (< R2022b)

test_main.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
function test_main(context, sel)
22
arguments
33
context {mustBeScalarOrEmpty} = []
4-
sel {mustBeScalarOrEmpty} = ~HasTag("exe") & ~HasTag("mex")
4+
sel {mustBeScalarOrEmpty} = ~HasTag("exe") & ~HasTag("mex") & ~HasTag("java_exe")
55
end
66

77
import matlab.unittest.TestRunner

0 commit comments

Comments
 (0)