Skip to content

Commit 2583347

Browse files
committed
Maintenance for R2024b
1) Update GitHub CI 2) Update .gitignore 3) Fix clear to clearvars in TrafficModelSoln 4) Update the ProjectStartupApp and project startup and shutdown files 5) Update the tests.
1 parent 5d6590d commit 2583347

63 files changed

Lines changed: 798 additions & 409 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ on:
88
branches: [ release ]
99
workflow_dispatch:
1010

11+
# Add permission to write GitHub pages
12+
permissions:
13+
contents: write
14+
pages: write
15+
id-token: write
16+
1117
jobs:
1218
test:
1319
strategy:
@@ -17,7 +23,7 @@ jobs:
1723
runs-on: ubuntu-latest
1824
steps:
1925
# Checks-out your repository
20-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2127

2228
# Sets up a display server
2329
- name: Start display server
@@ -33,9 +39,18 @@ jobs:
3339
with:
3440
release: ${{ matrix.MATLABVersion }}
3541
products: >
36-
Symbolic_Math_Toolbox
37-
Partial_Differential_Equation_Toolbox
38-
Statistics_and_Machine_Learning_Toolbox
42+
Symbolic_Math_Toolbox
43+
Partial_Differential_Equation_Toolbox
44+
Statistics_and_Machine_Learning_Toolbox
45+
# Simulink Statistics_and_Machine_Learning_Toolbox
46+
# List required products above in the format shown (and uncomment them)
47+
# List of product strings:
48+
# Simulink
49+
# Statistics_and_Machine_Learning_Toolbox
50+
# Simulink_Coder
51+
# Econometrics_Toolbox
52+
# Deep_Learning_Toolbox
53+
3954

4055
# Run all the tests
4156
- name: Run SmokeTests
@@ -45,10 +60,11 @@ jobs:
4560

4661
# Upload the test results as artifact
4762
- name: Upload TestResults
63+
if: ${{ always() }}
4864
uses: actions/upload-artifact@v4
4965
with:
5066
name: TestResults_${{ matrix.MATLABVersion }}
51-
path: ./SoftwareTests/TestResults_${{ matrix.MATLABVersion }}.txt
67+
path: ./public/*
5268
overwrite: true
5369

5470
badge:
@@ -62,7 +78,7 @@ jobs:
6278
# Checks-out your repository
6379
- uses: actions/checkout@v4
6480

65-
# Sets up R2024b
81+
# Sets up R2023b
6682
- name: Setup MATLAB
6783
uses: matlab-actions/setup-matlab@v2
6884
with:
@@ -72,15 +88,26 @@ jobs:
7288
- name: Download All TestResults
7389
uses: actions/download-artifact@v4
7490
with:
75-
path: SoftwareTests
91+
path: public
7692
pattern: TestResults_*
7793
merge-multiple: true
78-
94+
7995
# Create the test results badge
80-
- name: Run CreateBadge
96+
- name: Run PostSmokeTest
8197
uses: matlab-actions/run-command@v2
8298
with:
83-
command: openProject(pwd); CreateBadge;
99+
command: openProject(pwd); PostSmokeTest;
100+
101+
# Deploy reports to GitHub pages
102+
- name: Setup Pages
103+
uses: actions/configure-pages@v5
104+
- name: Upload pages artifact
105+
uses: actions/upload-pages-artifact@v3
106+
with:
107+
path: public
108+
- name: Deploy to GitHub Pages
109+
id: deployment
110+
uses: actions/deploy-pages@v4
84111

85112
# Commit the JSON for the MATLAB releases badge
86113
- name: Commit changed files

.gitignore

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,5 @@ codegen/
4747
# Project settings
4848
Utilities/ProjectSettings.mat
4949

50-
# Test results
51-
SoftwareTests/TestResults_*
52-
53-
# GitLab page fodler
54-
public/
50+
# GitLab page folder
51+
public/

.gitlab-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@ smoke-test:
2929
- VERSION: [R2024a,R2024b]
3030
script:
3131
- Set-Alias -Name matlab -Value "C:\Program Files\MATLAB\$VERSION\bin\matlab.exe"
32-
- matlab -batch "openProject(pwd);RunAllTests(true)"
32+
- matlab -batch "openProject(pwd);RunAllTests"
3333
when: always
3434
allow_failure: true
3535
artifacts:
36+
name: "$VERSION"
3637
paths:
3738
- public/*
3839
when: always
39-
expire_in: 1 years
4040

4141

4242
pages:
4343
tags:
4444
- matlab
4545
stage: deploy
4646
script:
47-
- echo 'Deploying pages'
47+
- matlab -batch "openProject(pwd);PostSmokeTest;"
4848
artifacts:
4949
paths:
5050
- public

Images/TestedWith.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"schemaVersion":1,"label":"Tested with","color":"success","message":"R2024a | R2024b"}
1+
{"schemaVersion":1,"label":"Tested with","color":"success","message":"R2024a"}
-1.11 KB
Binary file not shown.
4.44 MB
Binary file not shown.

InternalFiles/Citations/DataSourceFiles/.gitkeep

Whitespace-only changes.
831 KB
Binary file not shown.
203 KB
Loading
12.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)