Skip to content

Commit 9f7ba6e

Browse files
eszmweszmw
committed
Maintenance for R2024b
1) Update .gitattributes and .gitignore 2) Update workflow files for GitHub and set it to publish results on Pages 3) Update code with clearvars in place of clear 4) Add solutions to InstructorResources 5) Update the README with better links and image sizes 6) Update the startup app and the project to start the app 7) Update the SoftwareTests to a new structure and write necessary pre/post files 8) Update checkExercise1 as CheckExercise1 9) Remove OldVersions
1 parent 786b729 commit 9f7ba6e

File tree

61 files changed

+784
-434
lines changed

Some content is hidden

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

61 files changed

+784
-434
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*.slmx binary merge=mlAutoMerge
1717
*.sltx binary
1818
*.slxc binary
19-
*.slx binary merge=mlAutoMerge
19+
*.slx binary merge=mlAutoMerge linguist-language=Simulink
2020
*.slxp binary
2121

2222
## Other common binary file types

‎.github/ci.yml‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎.github/workflows/ci.yml‎

Lines changed: 70 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,61 +8,106 @@ 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:
1420
fail-fast: false
1521
matrix:
16-
MATLABVersion: [R2023a,R2023b]
22+
MATLABVersion: [R2024a,R2024b]
1723
runs-on: ubuntu-latest
1824
steps:
19-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
20-
- uses: actions/checkout@v3
25+
# Checks-out your repository
26+
- uses: actions/checkout@v4
27+
28+
# Sets up a display server
29+
- name: Start display server
30+
if: ${{ always() }}
31+
run: |
32+
sudo apt-get install xvfb
33+
Xvfb :99 &
34+
echo "DISPLAY=:99" >> $GITHUB_ENV
2135
22-
# Sets up MATLAB on the GitHub Actions runner
36+
# Sets up MATLAB
2337
- name: Setup MATLAB
24-
uses: matlab-actions/setup-matlab@v1
38+
uses: matlab-actions/setup-matlab@v2
2539
with:
2640
release: ${{ matrix.MATLABVersion }}
41+
products: >
42+
Symbolic_Math_Toolbox
43+
Mapping_Toolbox
44+
2745
28-
# Run SmokeTests
46+
# Run all the tests
2947
- name: Run SmokeTests
30-
uses: matlab-actions/run-command@v1
48+
uses: matlab-actions/run-command@v2
3149
with:
32-
command: openProject(pwd); results = runtests(fullfile("SoftwareTests","SmokeTests.m")); assertSuccess(results);
33-
34-
# Run FunctionTests
35-
- name: Run FunctionTests
36-
uses: matlab-actions/run-command@v1
37-
with:
38-
command: openProject(pwd); results = runtests(fullfile("SoftwareTests","FunctionTests.m")); assertSuccess(results);
50+
command: openProject(pwd); RunAllTests;
3951

4052
# Upload the test results as artifact
4153
- name: Upload TestResults
42-
uses: actions/upload-artifact@v3.1.3
54+
if: ${{ always() }}
55+
uses: actions/upload-artifact@v4
4356
with:
44-
name: TestResults
45-
path: ./SoftwareTests/TestResults_${{ matrix.MATLABVersion }}.txt
57+
name: TestResults_${{ matrix.MATLABVersion }}
58+
path: ./public/*
59+
overwrite: true
4660

61+
badge:
62+
if: ${{ always() }}
63+
needs: [test]
64+
strategy:
65+
fail-fast: false
66+
runs-on: ubuntu-latest
67+
steps:
68+
69+
# Checks-out your repository
70+
- uses: actions/checkout@v4
71+
72+
# Sets up R2023b
73+
- name: Setup MATLAB
74+
uses: matlab-actions/setup-matlab@v2
75+
with:
76+
release: R2024b
77+
4778
# Download the test results from artifact
48-
- name: Download TestResults
49-
uses: actions/download-artifact@v2.1.1
79+
- name: Download All TestResults
80+
uses: actions/download-artifact@v4
5081
with:
51-
name: TestResults
52-
path: ./SoftwareTests/
53-
82+
path: public
83+
pattern: TestResults_*
84+
merge-multiple: true
85+
5486
# Create the test results badge
55-
- name: Run CreateBadge
56-
uses: matlab-actions/run-command@v1
87+
- name: Run PostSmokeTest
88+
uses: matlab-actions/run-command@v2
89+
with:
90+
command: openProject(pwd); PostSmokeTest;
91+
92+
# Deploy reports to GitHub pages
93+
- name: Setup Pages
94+
uses: actions/configure-pages@v5
95+
- name: Upload pages artifact
96+
uses: actions/upload-pages-artifact@v3
5797
with:
58-
command: openProject(pwd); results = runtests(fullfile("SoftwareTests","CreateBadge.m"));
98+
path: public
99+
- name: Deploy to GitHub Pages
100+
id: deployment
101+
uses: actions/deploy-pages@v4
59102

60103
# Commit the JSON for the MATLAB releases badge
61104
- name: Commit changed files
62105
continue-on-error: true
63106
run: |
64107
git config user.name "${{ github.workflow }} by ${{ github.actor }}"
65108
git config user.email "<>"
109+
git pull
110+
git add Images/TestedWith.json
66111
git commit Images/TestedWith.json -m "Update CI badges ${{ github.ref_name }}"
67112
git fetch
68113
git push

‎.gitignore‎

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

50-
# Test results
51-
SoftwareTests/TestResults_*
50+
# GitLab page folder
51+
public/

‎.gitlab-ci.yml‎

Lines changed: 84 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,87 @@
11
stages:
2+
# Set up two testing paths
3+
- setup
24
- test
5+
- deploy
6+
- release
37

4-
matlab-test-job:
5-
tags:
6-
- matlab
7-
stage: test
8-
script:
9-
- matlab -batch "openProject('OrganizingData.prj'); results = runtests('IncludeSubfolders', true); assertSuccess(results);"
8+
setup-job:
9+
tags:
10+
- matlab
11+
stage: setup
12+
script:
13+
- cd ..
14+
- if (test-path utilities) { rm -r -force utilities }
15+
- git clone git@insidelabs-git.mathworks.com:modular-curriculum-content/utilities.git
16+
- cd $CI_PROJECT_NAME
17+
allow_failure: false
18+
19+
20+
smoke-test:
21+
# Smoke tests should run all the time
22+
tags:
23+
# Add additional tags like (e.g. - arduino) as required
24+
# Make sure that the runner you plan to use matches the tags
25+
- matlab
26+
stage: test
27+
parallel:
28+
matrix:
29+
- VERSION: [R2024a,R2024b]
30+
script:
31+
- Set-Alias -Name matlab -Value "C:\Program Files\MATLAB\$VERSION\bin\matlab.exe"
32+
- matlab -batch "openProject(pwd);RunAllTests"
33+
when: always
34+
allow_failure: true
35+
artifacts:
36+
name: "$VERSION"
37+
paths:
38+
- public/*
39+
when: always
40+
41+
42+
pages:
43+
tags:
44+
- matlab
45+
stage: deploy
46+
script:
47+
- matlab -batch "openProject(pwd);PostSmokeTest;"
48+
artifacts:
49+
paths:
50+
- public
51+
52+
file-test:
53+
tags:
54+
- matlab
55+
stage: release
56+
script:
57+
- matlab -batch "proj = openProject(pwd);
58+
addpath(proj.RootFolder+'/InternalFiles/Tests/CI');
59+
results = runtests('OpenCloseFileTest.m');
60+
disp(table(results)); assertSuccess(results);"
61+
rules:
62+
# This test should always run when merging to main
63+
# And be available for manual running on any push
64+
- if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH
65+
when: always
66+
- if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH
67+
when: manual
68+
allow_failure: true
69+
70+
release-testing:
71+
tags:
72+
- matlab
73+
stage: release
74+
script:
75+
- matlab -batch "proj = openProject(pwd);
76+
cd ..;
77+
addpath(genpath(fullfile('utilities','TestingResources')));
78+
addpath(genpath(fullfile('utilities','Tools')));
79+
runCMTests"
80+
rules:
81+
# This test should always run when merging to main
82+
# And be available for manual running on any push
83+
- if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH
84+
when: always
85+
- if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH
86+
when: manual
87+
allow_failure: true

‎FunctionLibrary/checkExercise1.mlx‎

-729 Bytes
Binary file not shown.

‎InstructorResources/Solutions/MemorySoln.mlx‎

81.9 KB
Binary file not shown.

‎InstructorResources/Solutions/NumericDataTypesSoln.mlx‎

65.2 KB
Binary file not shown.

‎InstructorResources/Solutions/StoringDataSoln.mlx‎

99.3 KB
Binary file not shown.

‎InstructorResources/Solutions/StringsSoln.mlx‎

78.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)