Merge pull request #64 from matlab-actions/hide-mbatch

Do not highlight matlab-batch in log

Author: mcafaro

.github/workflows/bat.yml

@@ -47,4 +47,6 @@ jobs:
         with:
           release: ${{ matrix.release }}
       - name: Run Sample MATLAB Command
-        run: matlab -batch "${{ matrix.command }}"
+        uses: matlab-actions/run-command@v1
+        with:
+          command: ${{ matrix.command }}

src/install.ts

@@ -25,23 +25,23 @@ export async function install(platform: string, release: string, skipActivationF
         );
     }
 
-    // Invoke ephemeral installer to setup a MATLAB on the runner
-    await core.group("Setting up MATLAB", () =>
-        script
+    // Set up MATLAB and matlab-batch
+    await core.group("Setting up MATLAB", () => {
+        const matlabResult = script
             .downloadAndRunScript(platform, properties.ephemeralInstallerUrl, [
                 "--release",
                 release,
                 skipActivationFlag,
             ])
-            .then(ematlab.addToPath)
-    );
+            .then(ematlab.addToPath);
 
-    const batchInstallDir = matlabBatch.installDir(platform);
+        const batchInstallDir = matlabBatch.installDir(platform);
 
-    await core.group("Setting up matlab-batch", () =>
-        script
+        const batchResult = script
             .downloadAndRunScript(platform, properties.matlabBatchInstallerUrl, [batchInstallDir])
-            .then(() => core.addPath(batchInstallDir))
-    )
+            .then(() => core.addPath(batchInstallDir));
+
+        return Promise.all([matlabResult, batchResult]);
+    });
     return;
 }

src/install.unit.test.ts

@@ -59,10 +59,10 @@ describe("install procedure", () => {
     it("rejects when executing the command returns with a non-zero code", async () => {
         downloadAndRunScriptMock
             .mockResolvedValueOnce(undefined)
-            .mockRejectedValueOnce(Error("oof"));
+            .mockRejectedValue(Error("oof"));
 
         await expect(doInstall()).rejects.toBeDefined();
-        expect(downloadAndRunScriptMock).toHaveBeenCalledTimes(2);
+        expect(downloadAndRunScriptMock).toHaveBeenCalledTimes(3);
         expect(addToPathMock).toHaveBeenCalledTimes(0);
         expect(core.group).toHaveBeenCalledTimes(2);
     });
@@ -72,7 +72,7 @@ describe("install procedure", () => {
         addToPathMock.mockRejectedValueOnce(Error("oof"));
 
         await expect(doInstall()).rejects.toBeDefined();
-        expect(downloadAndRunScriptMock).toHaveBeenCalledTimes(2);
+        expect(downloadAndRunScriptMock).toHaveBeenCalledTimes(3);
         expect(addToPathMock).toHaveBeenCalledTimes(1);
     });