Merge pull request #136 from mathworks/apple_silicon_final

Apple silicon final

Author: sameagen-MW

package-lock.json

@@ -144,11 +144,15 @@ export async function setupBatch(platform: string, architecture: string) {
     } catch (err: any) {
         throw new Error("Failed to add MATLAB to system path.");
     }
-    const exitCode = await taskLib.exec("chmod", ["+x", path.join(matlabBatchPath, "matlab-batch" + matlabBatchExt)]);
-    if (exitCode !== 0) {
-        return Promise.reject(Error("Unable to add execute permissions to matlab-batch binary."));
+    if (platform !== "win32") {
+        const exitCode = await taskLib.exec(
+            "chmod",
+            ["+x", path.join(matlabBatchPath, "matlab-batch" + matlabBatchExt)],
+        );
+        if (exitCode !== 0) {
+            return Promise.reject(Error("Unable to add execute permissions to matlab-batch binary."));
+        }
     }
-    return;
 }
 
 export async function installSystemDependencies(platform: string, architecture: string, release: string) {

tasks/install-matlab/v0/package-lock.json

@@ -37,10 +37,9 @@ export async function runCommand(command: string, platform: string, architecture
 }
 
 export async function getRunMATLABCommandPath(platform: string, architecture: string): Promise<string> {
-    if (architecture !== "x64") {
-        return Promise.reject(
-            `This task is not supported on ${platform} runners using the ${architecture} architecture.`,
-        );
+    if (architecture !== "x64" && !(platform === "darwin" && architecture === "arm64")) {
+        const msg = `This task is not supported on ${platform} runners using the ${architecture} architecture.`;
+        return Promise.reject(Error(msg));
     }
     let ext;
     let platformDir;
@@ -51,16 +50,19 @@ export async function getRunMATLABCommandPath(platform: string, architecture: st
             break;
         case "darwin":
             ext = "";
-            platformDir = "maci64";
+            if (architecture === "x64") {
+                platformDir = "maci64";
+            } else {
+                platformDir = "maca64";
+            }
             break;
         case "linux":
             ext = "";
             platformDir = "glnxa64";
             break;
         default:
-            return Promise.reject(
-                `This task is not supported on ${platform} runners using the ${architecture} architecture.`,
-            );
+            const msg = `This task is not supported on ${platform} runners using the ${architecture} architecture.`;
+            return Promise.reject(Error(msg));
     }
 
     const binDir = path.join(__dirname, "bin", platformDir);

tasks/install-matlab/v1/src/matlab.ts

@@ -130,9 +130,8 @@ export default function suite() {
                 stubExtractZip.restore();
             });
 
-            const testBin = (platform: string, subdirectory: string, ext: string) => {
-                it(`considers the appropriate rmc bin on ${platform}`, async () => {
-                    const architecture = "x64";
+            const testBin = (platform: string, architecture: string, subdirectory: string, ext: string) => {
+                it(`considers the appropriate rmc bin on ${platform} ${architecture}`, async () => {
                     const p = await matlab.getRunMATLABCommandPath(platform, architecture);
                     // unzips run-matlab-command binary
                     assert(stubExtractZip.callCount === 1);
@@ -141,9 +140,10 @@ export default function suite() {
                 });
             };
 
-            testBin("linux", "glnxa64", "");
-            testBin("win32", "win64", ".exe");
-            testBin("darwin", "maci64", "");
+            testBin("linux", "x64", "glnxa64", "");
+            testBin("win32", "x64", "win64", ".exe");
+            testBin("darwin", "x64", "maci64", "");
+            testBin("darwin", "arm64", "maca64", "");
 
             it("errors on unsupported platform", () => {
                 assert.rejects(async () => await matlab.getRunMATLABCommandPath("sunos", "x64"));