Skip to content

Commit 697994b

Browse files
mw-kapilgmw-kapilg
committed
fix merge conflict
2 parents f7f0650 + 10d7f2c commit 697994b

5 files changed

Lines changed: 2265 additions & 4681 deletions

File tree

‎.github/workflows/bat.yml‎

Lines changed: 40 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,37 @@
11
name: Build and Test
22
on: [push]
3+
permissions:
4+
contents: read
35

46
jobs:
57
bat:
68
name: Build and Test
7-
strategy:
8-
matrix:
9-
os: [ubuntu-latest, windows-latest, macos-latest]
10-
runs-on: ${{ matrix.os }}
9+
runs-on: ubuntu-22.04
1110
steps:
12-
- uses: actions/checkout@v4
13-
14-
- uses: actions/setup-node@v4
11+
- uses: actions/checkout@v5
12+
- uses: actions/setup-node@v5
1513
with:
1614
node-version: 20
1715
- name: Perform npm tasks
1816
run: npm run ci
17+
- uses: actions/upload-artifact@v4
18+
with:
19+
name: built-action
20+
path: |
21+
**/*
22+
!node_modules/
1923
24+
integ:
25+
needs: bat
26+
runs-on: ${{ matrix.os }}
27+
strategy:
28+
fail-fast: false
29+
matrix:
30+
os: [ubuntu-latest, windows-latest, macos-latest, macos-14]
31+
steps:
32+
- uses: actions/download-artifact@v5
33+
with:
34+
name: built-action
2035
- name: Perform 'setup-matlab'
2136
uses: matlab-actions/setup-matlab@v2
2237
with:
@@ -25,54 +40,44 @@ jobs:
2540
Simulink
2641
Simulink_Test
2742
Simulink_Coverage
28-
29-
- name: Run MATLAB tests for test results summary
30-
uses: ./
31-
continue-on-error: true
32-
3343
- name: Run MATLAB Tests
3444
uses: ./
3545
with:
3646
source-folder: sample
3747
startup-options: -logfile output.log
3848
continue-on-error: true
39-
40-
# Once new scriptgen version is live, verifications will be uncommentted before release
4149
# - name: Verify option application
4250
# run: |
4351
# set -e
4452
# grep "Running TheTruth" output.log
4553
# grep "Done TheTruth" output.log
4654
# grep "1 Passed" output.log
47-
55+
# shell: bash
4856
- name: Generate Model
4957
uses: matlab-actions/run-command@v2
5058
with:
51-
command: cd('sample'),createSampleModel('temp_model'),sltest.testmanager.createTestsFromModel('sltestfile', 'temp_model');
52-
59+
command: cd('sample'),createSampleModel('temp_model'),sltest.testmanager.createTestsFromModel('sltestfile', 'temp_model');
5360
- name: Set up diary for logging
5461
run: echo 'diary console.log' >> startup.m
55-
5662
- name: Run run-test command
5763
uses: ./
5864
with:
59-
test-results-simulink-test: test-results/simulinktest.mldatx
60-
model-coverage-cobertura: test-results/modelcoverage.xml
61-
test-results-pdf: test-results/pdf-results.pdf
62-
select-by-folder: sample
63-
strict: true
64-
use-parallel: true
65-
output-detail: Detailed
66-
logging-level: Detailed
65+
test-results-simulink-test: test-results/simulinktest.mldatx
66+
model-coverage-cobertura: test-results/modelcoverage.xml
67+
test-results-pdf: test-results/pdf-results.pdf
68+
select-by-folder: sample
69+
strict: true
70+
use-parallel: true
71+
output-detail: Detailed
72+
logging-level: Detailed
6773
continue-on-error: true
68-
69-
# Once new scriptgen version is live, verifications will be updated before release
7074
# - name: Verify artifacts generation
7175
# run: |
72-
# (test -f test-results/simulinktest.mldatx) || (echo "File simulinktest.mldatx does not exist" && exit 1)
73-
# (test -f test-results/modelcoverage.xml) || (echo "File modelcoverage.xml does not exist" && exit 1)
74-
# (test -f test-results/pdf-results.pdf) || (echo "File pdf-results.pdf does not exist" && exit 1)
75-
# grep -q "runner.addPlugin(FailOnWarningsPlugin())" console.log
76-
# grep -q "runInParallel" console.log
77-
# grep -q "'OutputDetail', 3" console.log
78-
# grep -q "'LoggingLevel', 3" console.log
76+
# (test -f test-results/simulinktest.mldatx) || (echo "File simulinktest.mldatx does not exist" && exit 1)
77+
# (test -f test-results/modelcoverage.xml) || (echo "File modelcoverage.xml does not exist" && exit 1)
78+
# (test -f test-results/pdf-results.pdf) || (echo "File pdf-results.pdf does not exist" && exit 1)
79+
# grep -q "runner.addPlugin(FailOnWarningsPlugin())" console.log
80+
# grep -q "runInParallel" console.log
81+
# grep -q "'OutputDetail', 3" console.log
82+
# grep -q "'LoggingLevel', 3" console.log
83+
# shell: bash

‎.github/workflows/publish.yml‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
name: Publish
2-
32
on:
43
release:
5-
types: [published, edited]
4+
types: published
5+
permissions:
6+
contents: write
67

78
jobs:
89
build:
@@ -11,15 +12,12 @@ jobs:
1112
outputs:
1213
tag: ${{ steps.update-package-version.outputs.version }}
1314
steps:
14-
# Configure runner with the right stuff
15-
- uses: actions/checkout@v4
16-
with:
17-
token: ${{ secrets.GITHUB_TOKEN }}
15+
- uses: actions/checkout@v5
1816
- name: Configure git
1917
run: |
2018
git config user.name 'Release Action'
2119
git config user.email '<>'
22-
- uses: actions/setup-node@v4
20+
- uses: actions/setup-node@v5
2321
with:
2422
node-version: 20
2523

@@ -31,7 +29,6 @@ jobs:
3129
run: |
3230
git tag -d "${{ github.event.release.tag_name }}"
3331
VERSION=$(npm version "${{ github.event.release.tag_name }}" --no-git-tag-version)
34-
echo "::set-output name=version::$VERSION"
3532
git add package.json package-lock.json
3633
git commit -m "[skip ci] Bump $VERSION"
3734
git push origin HEAD:main
@@ -47,8 +44,8 @@ jobs:
4744
id: release_info
4845
run: |
4946
# Check for semantic versioning
50-
echo "Preparing release for version $longVersion"
5147
longVersion="${{github.event.release.tag_name}}"
48+
echo "Preparing release for version $longVersion"
5249
[[ $longVersion == v[0-9]*.[0-9]*.[0-9]* ]] || (echo "must follow semantic versioning" && exit 1)
5350
majorVersion=$(echo ${longVersion%.*.*})
5451
minorVersion=$(echo ${longVersion%.*})
@@ -78,4 +75,3 @@ jobs:
7875
git push -f origin $longVersion
7976
git push -f origin $majorVersion
8077
git push -f origin $minorVersion
81-

‎README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,5 +133,9 @@ Input | Description
133133
- [Action for Setting Up MATLAB](https://github.com/matlab-actions/setup-matlab/)
134134
- [Continuous Integration with MATLAB and Simulink](https://www.mathworks.com/solutions/continuous-integration.html)
135135

136-
## Contact Us
137-
If you have any questions or suggestions, contact MathWorks&reg; at [continuous-integration@mathworks.com](mailto:continuous-integration@mathworks.com).
136+
## Feedback and Support
137+
If you encounter a product licensing issue, consider requesting a MATLAB batch licensing token to use in your workflow. For more information, see [Use MATLAB Batch Licensing Token](#use-matlab-batch-licensing-token).
138+
139+
If you have an enhancement request or other feedback about this action, create an issue on the [Issues](https://github.com/matlab-actions/run-tests/issues) page.
140+
141+
For support, contact [MathWorks Technical Support](https://www.mathworks.com/support/contact_us.html).

0 commit comments

Comments
 (0)