resolve merge conflicts

Author: mw-kapilg

.github/workflows/bat.yml

@@ -62,22 +62,34 @@ jobs:
       - name: Run run-test command
         uses: ./
         with:
-          test-results-simulink-test: test-results/simulinktest.mldatx
-          model-coverage-cobertura: test-results/modelcoverage.xml
-          test-results-pdf: test-results/pdf-results.pdf
-          select-by-folder: sample
-          strict: true
-          use-parallel: true
-          output-detail: Detailed
-          logging-level: Detailed
-        continue-on-error: true
+            test-results-simulink-test: test-results/simulinktest.mldatx
+            model-coverage-cobertura: test-results/modelcoverage.xml
+            test-results-pdf: test-results/pdf-results.pdf
+            test-results-junit: test-results/results.xml
+            code-coverage-cobertura: test-results/coverage.xml
+            code-coverage-html: test-results/coverageHTML
+            model-coverage-html: test-results/modelcoverageHTML
+            test-results-html: test-results/resultsHTML
+            select-by-folder: sample
+            strict: true
+            use-parallel: true
+            output-detail: Detailed
+            logging-level: Detailed
       - name: Verify artifacts generation
         run: |
-          (test -f test-results/simulinktest.mldatx) || (echo "File simulinktest.mldatx does not exist" && exit 1)
-          (test -f test-results/modelcoverage.xml) || (echo "File modelcoverage.xml does not exist" && exit 1)
-          (test -f test-results/pdf-results.pdf) || (echo "File pdf-results.pdf does not exist" && exit 1)
-          grep -q "runner.addPlugin(FailOnWarningsPlugin())" console.log
-          grep -q "runInParallel" console.log
-          grep -q "'OutputDetail', 3" console.log
-          grep -q "'LoggingLevel', 3" console.log
+            (test -f test-results/simulinktest.mldatx) || (echo "File simulinktest.mldatx does not exist" && exit 1)
+            (test -f test-results/modelcoverage.xml) || (echo "File modelcoverage.xml does not exist" && exit 1)
+            (test -f test-results/pdf-results.pdf) || (echo "File pdf-results.pdf does not exist" && exit 1)
+            (test -f test-results/results.xml) || (echo "File results.xml does not exist" && exit 1)
+            (test -f test-results/coverage.xml) || (echo "File coverage.xml does not exist" && exit 1)
+            (test -d test-results/coverageHTML) || (echo "Directory coverageHTML does not exist" && exit 1)
+            (test -f test-results/coverageHTML/*.html) || (echo "No HTML file found" && exit 1)
+            (test -d test-results/modelcoverageHTML) || (echo "Directory modelcoverageHTML does not exist" && exit 1)
+            (test -f test-results/modelcoverageHTML/*.html) || (echo "No HTML file found" && exit 1)
+            (test -d test-results/resultsHTML) || (echo "Directory resultsHTML does not exist" && exit 1)
+            (test -f test-results/resultsHTML/*.html) || (echo "No HTML file found" && exit 1)
+            grep -q "runner.addPlugin(FailOnWarningsPlugin())" console.log
+            grep -q "runInParallel" console.log
+            grep -q "'OutputDetail', 3" console.log
+            grep -q "'LoggingLevel', 3" console.log
         shell: bash

.npmrc

@@ -0,0 +1 @@
+registry=https://registry.npmjs.org/

README.md

@@ -4,7 +4,7 @@ The [Run MATLAB Tests](#run-matlab-tests) action enables you to run MATLAB®
 - To use a self-hosted runner, set up a computer with MATLAB on its path and register the runner with GitHub Actions. (On self-hosted UNIX® runners, you can also use the **Setup MATLAB** action instead of having MATLAB already installed.) The runner uses the topmost MATLAB release on the system path to execute your workflow.
 
 ## Examples
-Use the **Run MATLAB Tests** action to automatically run tests authored using the MATLAB unit testing framework or Simulink Test™. You can use this action with optional inputs to generate various test and coverage artifacts.
+Use the **Run MATLAB Tests** action to automatically run tests authored using the MATLAB unit testing framework or Simulink Test™. To use the action, you need MATLAB R2013b or a later release. Some of the optional action inputs require newer MATLAB releases or additional toolboxes.
 
 ### Run Tests in MATLAB Project
 On a self-hosted runner that has MATLAB installed, run the tests in your [MATLAB project](https://www.mathworks.com/help/matlab/projects.html). To run the tests, specify the **Run MATLAB Tests** action in your workflow.
@@ -115,12 +115,15 @@ Input                     | Description
 `use-parallel`              | <p>(Optional) Option to run tests in parallel, specified as `false` or `true`. By default, the value is `false` and tests run in serial. If the test runner configuration is suited for parallelization, you can specify a value of `true` to run tests in parallel. This input requires a Parallel Computing Toolbox license.</p><p>**Example:** `use-parallel: true`</p>
 `output-detail`            | <p>(Optional) Amount of event detail displayed for the test run, specified as `none`, `terse`, `concise`, `detailed`, or `verbose`. By default, the action displays failing and logged events at the `detailed` level and test run progress at the `concise` level.<p></p>**Example:** `output-detail: verbose`</p>
 `logging-level`            | <p>(Optional) Maximum verbosity level for logged diagnostics included for the test run, specified as `none`, `terse`, `concise`, `detailed`, or `verbose`. By default, the action includes diagnostics logged at the `terse` level.<p></p>**Example:** `logging-level: detailed`</p> 
-`test-results-pdf`          | <p>(Optional) Location to write the test results in PDF format, specified as a path relative to the project root folder. On macOS platforms, this input is supported in MATLAB R2020b and later.</p><p>**Example:** `test-results-pdf: test-results/results.pdf`</p>
-`test-results-junit`        | <p>(Optional) Location to write the test results in JUnit-style XML format, specified as a path relative to the project root folder.</p><p>**Example:** `test-results-junit: test-results/results.xml`</p>
-`test-results-simulink-test` | <p>(Optional) Location to export Simulink Test Manager results in MLDATX format, specified as a path relative to the project root folder. This input requires a Simulink Test license and is supported in MATLAB R2019a and later.</p><p>**Example:** `test-results-simulink-test: test-results/results.mldatx`</p>
-`code-coverage-cobertura`   | <p>(Optional) Location to write the code coverage results in Cobertura XML format, specified as a path relative to the project root folder.</p><p>**Example:** `code-coverage-cobertura: code-coverage/coverage.xml`</p>
-`model-coverage-cobertura`  | <p>(Optional) Location to write the model coverage results in Cobertura XML format, specified as a path relative to the project root folder. This input requires a Simulink Coverage™ license and is supported in MATLAB R2018b and later.</p><p>**Example:** `model-coverage-cobertura: model-coverage/coverage.xml`</p>
-`startup-options`         | <p>(Optional) MATLAB startup options, specified as a list of options separated by spaces. For more information about startup options, see [Commonly Used Startup Options](https://www.mathworks.com/help/matlab/matlab_env/commonly-used-startup-options.html).</p><p>Using this input to specify the `-batch` or `-r` option is not supported.</p><p>**Example:** `startup-options: -nojvm`<br/>**Example:** `startup-options: -nojvm -logfile output.log`</p>
+`test-results-html`         | <p>(Optional) Location to write the test results in HTML format, specified as a folder path relative to the project root folder.</p><p>**Example:** `test-results-html: test-results`</p>
+`test-results-pdf`          | <p>(Optional) Location to write the test results in PDF format, specified as a file path relative to the project root folder. On macOS platforms, this input is supported in MATLAB R2020b and later.</p><p>**Example:** `test-results-pdf: test-results/results.pdf`</p>
+`test-results-junit`        | <p>(Optional) Location to write the test results in JUnit-style XML format, specified as a file path relative to the project root folder.</p><p>**Example:** `test-results-junit: test-results/results.xml`</p>
+`test-results-simulink-test` | <p>(Optional) Location to export Simulink Test Manager results in MLDATX format, specified as a file path relative to the project root folder. This input requires a Simulink Test license and is supported in MATLAB R2019a and later.</p><p>**Example:** `test-results-simulink-test: test-results/results.mldatx`</p>
+`code-coverage-html`         | <p>(Optional) Location to write the code coverage results in HTML format, specified as a folder path relative to the project root folder.</p><p>**Example:** `code-coverage-html: code-coverage`</p>
+`code-coverage-cobertura`    | <p>(Optional) Location to write the code coverage results in Cobertura XML format, specified as a file path relative to the project root folder.</p><p>**Example:** `code-coverage-cobertura: code-coverage/coverage.xml`</p>
+`model-coverage-html`        | <p>(Optional) Location to write the model coverage results in HTML format, specified as a folder path relative to the project root folder. This input requires a Simulink Coverage&trade; license and is supported in MATLAB R2018b and later.</p><p>**Example:** `model-coverage-html: model-coverage`</p>
+`model-coverage-cobertura`  | <p>(Optional) Location to write the model coverage results in Cobertura XML format, specified as a file path relative to the project root folder. This input requires a Simulink Coverage license and is supported in MATLAB R2018b and later.</p><p>**Example:** `model-coverage-cobertura: model-coverage/coverage.xml`</p>
+`startup-options`           | <p>(Optional) MATLAB startup options, specified as a list of options separated by spaces. For more information about startup options, see [Commonly Used Startup Options](https://www.mathworks.com/help/matlab/matlab_env/commonly-used-startup-options.html).</p><p>Using this input to specify the `-batch` or `-r` option is not supported.</p><p>**Example:** `startup-options: -nojvm`<br/>**Example:** `startup-options: -nojvm -logfile output.log`</p>
 
 ## Notes
 * By default, when you use the **Run MATLAB Tests** action, the root of your repository serves as the MATLAB startup folder. To run your tests using a different folder, specify the `-sd` startup option in the action.

action.yml

@@ -41,27 +41,42 @@ inputs:
     default: ""
   test-results-pdf:
     description: >-
-      Path to write test results report in PDF format
+      File path to write test results in PDF format
+    required: false
+    default: ""
+  test-results-html:
+    description: >-
+      Folder path to write test results in HTML format
     required: false
     default: ""
   test-results-junit:
     description: >-
-      Path to write test results report in JUnit XML format
+      File path to write test results in JUnit-style XML format
     required: false
     default: ""
   test-results-simulink-test:
     description: >-
-      Path to export Simulink Test Manager results in MLDATX format
+      File path to export Simulink Test Manager results in MLDATX format
     required: false
     default: ""
   code-coverage-cobertura:
     description: >-
-      Path to write code coverage report in Cobertura XML format
+      File path to write code coverage results in Cobertura XML format
+    required: false
+    default: ""
+  code-coverage-html:
+    description: >-
+      Folder path to write code coverage results in HTML format
     required: false
     default: ""
   model-coverage-cobertura:
     description: >-
-      Path to write model coverage report in Cobertura XML format
+      File path to write model coverage results in Cobertura XML format
+    required: false
+    default: ""
+  model-coverage-html:
+    description: >-
+      Folder path to write model coverage results in HTML format
     required: false
     default: ""
   startup-options:

package-lock.json

@@ -1,7 +1,7 @@
 {
     "name": "run-matlab-tests-action",
     "author": "The MathWorks, Inc.",
-    "version": "2.1.2",
+    "version": "2.2.0",
     "description": "",
     "main": "lib/index.js",
     "scripts": {
@@ -21,8 +21,8 @@
     "dependencies": {
         "@actions/core": "^1.11.1",
         "@actions/exec": "^1.1.1",
-        "run-matlab-command-action": "github:matlab-actions/run-command#v2.2.1",
-        "common-utils": "github:matlab-actions/common-utils#kapilg/refactor"
+        "common-utils": "github:matlab-actions/common-utils#kapilg/refactor",
+        "run-matlab-command-action": "github:matlab-actions/run-command#v2.3.0"
     },
     "devDependencies": {
         "@types/jest": "^30.0.0",

package.json

@@ -8,7 +8,7 @@ import { testResultsSummary } from "common-utils";
 import * as path from "path";
 
 /**
- * Gather action inputs and then run action.
+ * Gather action inputs and then run action
  */
 async function run() {
     const platform = process.platform;
@@ -18,10 +18,13 @@ async function run() {
     const options: scriptgen.RunTestsOptions = {
         JUnitTestResults: core.getInput("test-results-junit"),
         CoberturaCodeCoverage: core.getInput("code-coverage-cobertura"),
+        HTMLCodeCoverage: core.getInput("code-coverage-html"),
         SourceFolder: core.getInput("source-folder"),
         PDFTestReport: core.getInput("test-results-pdf"),
+        HTMLTestReport: core.getInput("test-results-html"),
         SimulinkTestResults: core.getInput("test-results-simulink-test"),
         CoberturaModelCoverage: core.getInput("model-coverage-cobertura"),
+        HTMLModelCoverage: core.getInput("model-coverage-html"),
         SelectByTag: core.getInput("select-by-tag"),
         SelectByFolder: core.getInput("select-by-folder"),
         Strict: core.getBooleanInput("strict"),

src/index.ts

@@ -9,10 +9,13 @@ import * as path from "path";
 export interface RunTestsOptions {
     JUnitTestResults?: string;
     CoberturaCodeCoverage?: string;
+    HTMLCodeCoverage?: string;
     SourceFolder?: string;
     PDFTestReport?: string;
+    HTMLTestReport?: string;
     SimulinkTestResults?: string;
     CoberturaModelCoverage?: string;
+    HTMLModelCoverage?: string;
     SelectByTag?: string;
     SelectByFolder?: string;
     Strict?: boolean;
@@ -32,10 +35,13 @@ export function generateCommand(options: RunTestsOptions): string {
         testScript = genscript('Test',
             'JUnitTestResults','${options.JUnitTestResults || ""}',
             'CoberturaCodeCoverage','${options.CoberturaCodeCoverage || ""}',
+            'HTMLCodeCoverage','${options.HTMLCodeCoverage || ""}',
             'SourceFolder','${options.SourceFolder || ""}',
             'PDFTestReport','${options.PDFTestReport || ""}',
+            'HTMLTestReport','${options.HTMLTestReport || ""}',
             'SimulinkTestResults','${options.SimulinkTestResults || ""}',
             'CoberturaModelCoverage','${options.CoberturaModelCoverage || ""}',
+            'HTMLModelCoverage','${options.HTMLModelCoverage || ""}',
             'SelectByTag','${options.SelectByTag || ""}',
             'SelectByFolder','${options.SelectByFolder || ""}',
             'Strict',${options.Strict || false},