Maintenance of Live Modules Update for 2024b+.

- Updated CI
- Updated Smoke Tests
- Plotting hard-coded color updates
- Project structure updates
- Added Instructor Solutions

Author: callieEDU

.gitattributes

@@ -16,7 +16,7 @@
 *.slmx binary merge=mlAutoMerge
 *.sltx binary
 *.slxc binary
-*.slx binary merge=mlAutoMerge
+*.slx binary merge=mlAutoMerge linguist-language=Simulink
 *.slxp binary
 
 ## Other common binary file types

.github/workflows/ci.yml

@@ -1,73 +1,109 @@
-name: Module Test
+name: MATLAB Build
 
 # Controls when the action will run. 
 on:
   push:
     branches: [ release ]
   pull_request:
     branches: [ release ]
+  workflow_dispatch:
+
+# Add permission to write GitHub pages
+permissions:
+  contents: write
+  pages: write
+  id-token: write
 
 jobs:
-  RunTests:
+  test:
     strategy: 
       fail-fast: false
       matrix:
-        MATLABVersion: [R2024a]
+        MATLABVersion: [R2024a,R2024b]
     runs-on: ubuntu-latest
     steps:
       # Checks-out your repository
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      
+      # Sets up a display server
+      - name: Start display server
+        if: ${{ always() }}
+        run: |
+          sudo apt-get install xvfb
+          Xvfb :99 &
+          echo "DISPLAY=:99" >> $GITHUB_ENV
       
       # Sets up MATLAB
       - name: Setup MATLAB
-        uses: matlab-actions/setup-matlab@v1
+        uses: matlab-actions/setup-matlab@v2
         with:
           release: ${{ matrix.MATLABVersion }}
+          products: MATLAB Simulink Control_System_Toolbox Simscape Simscape_Driveline Simscape_Multibody 
+          # List required products above in the format shown (and uncomment them)
+          # List of product strings:
+          # Simulink
+          # Statistics_and_Machine_Learning_Toolbox
+          # Simulink_Coder
+          # Econometrics_Toolbox
+          # Deep_Learning_Toolbox
+
 
       # Run all the tests
       - name: Run SmokeTests
-        uses: matlab-actions/run-command@v1
+        uses: matlab-actions/run-command@v2
         with:
           command: openProject(pwd); RunAllTests; 
 
       # Upload the test results as artifact
       - name: Upload TestResults
-        if: always()
-        uses: actions/upload-artifact@v3.1.3
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v4
         with:
-          name: TestResults
-          path: ./SoftwareTests/TestResults_${{ matrix.MATLABVersion }}.txt
+          name: TestResults_${{ matrix.MATLABVersion }}
+          path: ./public/*
+          overwrite: true
 
-
-  CreateBadge:
+  badge:
     if: ${{ always() }}
-    needs: [RunTests]
+    needs: [test]
     strategy: 
       fail-fast: false
     runs-on: ubuntu-latest
     steps: 
 
       # Checks-out your repository
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Sets up R2023b
       - name: Setup MATLAB
-        uses: matlab-actions/setup-matlab@v1
+        uses: matlab-actions/setup-matlab@v2
         with:
-          release: R2023b
+          release: R2024b
 
       # Download the test results from artifact
-      - name: Download TestResults
-        uses: actions/download-artifact@v2.1.1
+      - name: Download All TestResults
+        uses: actions/download-artifact@v4
         with:
-          name: TestResults
-          path: ./SoftwareTests/
-
+          path: public
+          pattern: TestResults_*
+          merge-multiple: true
+          
       # Create the test results badge
-      - name: Run CreateBadge
-        uses: matlab-actions/run-command@v1
+      - name: Run PostSmokeTest
+        uses: matlab-actions/run-command@v2
+        with:
+          command: openProject(pwd); PostSmokeTest;
+      
+      # Deploy reports to GitHub pages
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Upload pages artifact
+        uses: actions/upload-pages-artifact@v3
         with:
-          command: openProject(pwd); CreateBadge;
+          path: public
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
 
       # Commit the JSON for the MATLAB releases badge 
       - name: Commit changed files

.gitignore

@@ -47,5 +47,5 @@ codegen/
 # Project settings
 Utilities/ProjectSettings.mat
 
-# Test results
-SoftwareTests/TestResults_*
+# GitLab page folder
+public/

Images/TestedWith.json

@@ -1 +1 @@
-{"schemaVersion":1,"label":"Tested with","color":"success","message":"R2024a"}
+{"schemaVersion":1,"label":"Tested with","color":"success","message":"R2024a | R2024b"}

InstructorResources/Solutions/CruiseControlSoln.mlx

@@ -4,7 +4,7 @@
     end
 
     properties (ClassSetupParameter)
-        Project = {''};
+        Project = {currentProject()};
     end
 
     properties (TestParameter)
@@ -15,8 +15,8 @@
     methods (TestParameterDefinition,Static)
 
         function Version = GetResults(Project)
-            RootFolder = currentProject().RootFolder;
-            Version = dir(fullfile(RootFolder,"SoftwareTests","TestResults*.txt"));
+            RootFolder = Project.RootFolder;
+            Version = dir(fullfile(RootFolder,"public","TestResults*.txt"));
             Version = extractBetween([Version.name],"TestResults_",".txt");
         end
 
@@ -37,9 +37,11 @@ function SetUpSmokeTest(testCase,Project)
     methods(Test)
 
         function CheckResults(testCase,Version)
-            File = fullfile("SoftwareTests","TestResults_"+Version+".txt");
+            File = fullfile("public","TestResults_"+Version+".txt");
             Results = readtable(File,TextType="string");
-            testCase.verifyTrue(all(Results.Passed));
+            if ~all(Results.Passed)
+                error("Some of the tests did not pass.")
+            end
         end
 
     end