Add matlab-batch and --skip-activation (#40)

* skips ematlab activation if MATHWORKS env vars are set

* added matlab-batch install

Author: davidbuzinski

src/ematlab.ts

@@ -16,3 +16,7 @@ export function addToPath() {
     }
     core.addPath(path.join(root, "bin"));
 }
+
+export function skipActivationFlag(env: NodeJS.ProcessEnv): string {
+    return (env.MATHWORKS_TOKEN !== undefined && env.MATHWORKS_ACCOUNT !== undefined)? "--skip-activation": "";
+}

src/ematlab.unit.test.ts

@@ -29,4 +29,16 @@ describe("ephemeral matlab", () => {
     it("rejects when root file does not exist", async () => {
         expect(() => ematlab.addToPath()).toThrow();
     });
+
+    it("adds --skip-activation flag if env vars are set", async () => {
+        let env = {"MATHWORKS_ACCOUNT": "janedoe@mathworks.com", "MATHWORKS_TOKEN": "token123456"};
+        let flag = ematlab.skipActivationFlag(env);
+        expect(flag).toEqual("--skip-activation")
+    })
+
+    it("doesn't add --skip-activation flag if env vars are not set", async () => {
+        let env = {};
+        let flag = ematlab.skipActivationFlag(env);
+        expect(flag).toEqual("")
+    })
 });

src/index.ts

@@ -1,6 +1,7 @@
-// Copyright 2020 The MathWorks, Inc.
+// Copyright 2020-2022 The MathWorks, Inc.
 
 import * as core from "@actions/core";
+import * as ematlab from "./ematlab";
 import * as install from "./install";
 
 /**
@@ -9,8 +10,8 @@ import * as install from "./install";
 export async function run() {
     const platform = process.platform;
     const release = core.getInput("release");
-
-    return install.install(platform, release);
+    const skipActivationFlag = ematlab.skipActivationFlag(process.env);
+    return install.install(platform, release, skipActivationFlag);
 }
 
 run().catch((e) => {

src/install.ts

@@ -4,6 +4,7 @@ import * as core from "@actions/core";
 import properties from "./properties.json";
 import * as script from "./script";
 import * as ematlab from "./ematlab";
+import * as matlabBatch from "./matlabBatch";
 
 export default install;
 
@@ -16,7 +17,7 @@ export default install;
  * @param platform Operating system of the runner (e.g., "win32" or "linux").
  * @param release Release of MATLAB to be set up (e.g., "latest" or "R2020a").
  */
-export async function install(platform: string, release: string) {
+export async function install(platform: string, release: string, skipActivationFlag: string) {
     // Install runtime system dependencies for MATLAB on Linux
     if (platform === "linux") {
         await core.group("Preparing system for MATLAB", () =>
@@ -30,9 +31,17 @@ export async function install(platform: string, release: string) {
             .downloadAndRunScript(platform, properties.ephemeralInstallerUrl, [
                 "--release",
                 release,
+                skipActivationFlag,
             ])
             .then(ematlab.addToPath)
     );
 
+    const batchInstallDir = matlabBatch.installDir(platform);
+
+    await core.group("Setting up matlab-batch", () =>
+        script
+            .downloadAndRunScript(platform, properties.matlabBatchInstallerUrl, [batchInstallDir])
+            .then(() => core.addPath(batchInstallDir))
+    )
     return;
 }

src/install.unit.test.ts

@@ -1,4 +1,4 @@
-// Copyright 2020 The MathWorks, Inc.
+// Copyright 2020-2022 The MathWorks, Inc.
 
 import * as core from "@actions/core";
 import * as install from "./install";
@@ -21,7 +21,8 @@ describe("install procedure", () => {
     // they can be held static for these unit tests
     const platform = "linux";
     const release = "latest";
-    const doInstall = () => install.install(platform, release);
+    const skipActivationFlag = ""
+    const doInstall = () => install.install(platform, release, skipActivationFlag);
 
     beforeEach(() => {
         downloadAndRunScriptMock = script.downloadAndRunScript as jest.Mock;
@@ -32,15 +33,19 @@ describe("install procedure", () => {
         (core.group as jest.Mock).mockImplementation(async (_, func) => {
             return func();
         });
+        (core.addPath as jest.Mock).mockImplementation(async (_) => {
+            return;
+        });
     });
 
     it("ideally works", async () => {
         downloadAndRunScriptMock.mockResolvedValue(undefined);
         addToPathMock.mockResolvedValue(undefined);
 
         await expect(doInstall()).resolves.toBeUndefined();
-        expect(downloadAndRunScriptMock).toHaveBeenCalledTimes(2);
+        expect(downloadAndRunScriptMock).toHaveBeenCalledTimes(3);
         expect(addToPathMock).toHaveBeenCalledTimes(1);
+        expect(core.addPath).toHaveBeenCalledTimes(1);
     });
 
     it("rejects when the download fails", async () => {
@@ -76,8 +81,8 @@ describe("install procedure", () => {
             downloadAndRunScriptMock.mockResolvedValue(undefined);
             addToPathMock.mockResolvedValue(undefined);
 
-            await expect(install.install(os, release)).resolves.toBeUndefined();
-            expect(downloadAndRunScriptMock).toHaveBeenCalledTimes(1);
+            await expect(install.install(os, release, skipActivationFlag)).resolves.toBeUndefined();
+            expect(downloadAndRunScriptMock).toHaveBeenCalledTimes(2);
             expect(addToPathMock).toHaveBeenCalledTimes(1);
         });
     });

src/matlabBatch.ts

@@ -0,0 +1,13 @@
+// Copyright 2022 The MathWorks, Inc.
+
+import path from "path";
+
+export function installDir(platform: string) {
+    let batchInstallDir : string;
+    if (platform === "win32") {
+        batchInstallDir = path.join("C:","Program Files", "matlab-batch");
+    } else {
+        batchInstallDir = path.join("/","opt","matlab-batch");
+    }
+    return batchInstallDir
+}

src/matlabBatch.unit.test.ts

@@ -0,0 +1,16 @@
+// Copyright 2022 The MathWorks, Inc.
+
+import * as matlabBatch from "./matlabBatch";
+
+describe("matlab-batch", () => {
+    const testCase = (platform: string, subdirectory: string) => {
+        it(`sets correct install directory for ${platform}`, async () => {
+            const installDir = matlabBatch.installDir(platform);
+            expect(installDir).toContain(subdirectory);
+        })
+    };
+    
+    testCase("win32", 'Program Files');
+    testCase("darwin", "opt");
+    testCase("linux", "opt");
+})

src/properties.json

@@ -1,4 +1,5 @@
 {
+    "matlabBatchInstallerUrl": "https://ssd.mathworks.com/supportfiles/ci/matlab-batch/v0/install.sh",
     "matlabDepsUrl": "https://ssd.mathworks.com/supportfiles/ci/matlab-deps/v0/install.sh",
     "ephemeralInstallerUrl": "https://ssd.mathworks.com/supportfiles/ci/ephemeral-matlab/v0/ci-install.sh"
 }