Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add initial maca support #38

Merged
merged 1 commit into from
Aug 5, 2024
Merged

Add initial maca support #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions matlab-plugin-agent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,21 +78,35 @@
<goal>wget</goal>
</goals>
<configuration>
<url>https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v1/glnxa64/run-matlab-command</url>
<url>https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v2/glnxa64/run-matlab-command</url>
<unpack>false</unpack>
<skipCache> true </skipCache>
<overwrite> true </overwrite>
<outputDirectory>${basedir}/src/main/resources/glnxa64</outputDirectory>
</configuration>
</execution>
<execution>
<id>get-matlab-runner-mac</id>
<id>get-matlab-runner-maca</id>
<phase>validate</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v1/maci64/run-matlab-command</url>
<url>https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v2/maca64/run-matlab-command</url>
<unpack>false</unpack>
<skipCache> true </skipCache>
<overwrite> true </overwrite>
<outputDirectory>${basedir}/src/main/resources/maca64</outputDirectory>
</configuration>
</execution>
<execution>
<id>get-matlab-runner-maci</id>
<phase>validate</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v2/maci64/run-matlab-command</url>
<unpack>false</unpack>
<skipCache> true </skipCache>
<overwrite> true </overwrite>
Expand All @@ -106,7 +120,7 @@
<goal>wget</goal>
</goals>
<configuration>
<url>https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v1/win64/run-matlab-command.exe</url>
<url>https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v2/win64/run-matlab-command.exe</url>
<unpack>false</unpack>
<skipCache> true </skipCache>
<overwrite> true </overwrite>
Expand Down
6 changes: 5 additions & 1 deletion matlab-plugin-agent/src/main/java/com/mathworks/ci/MatlabCommandRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,11 @@ private String copyExecutable(BuildRunnerContext runnerContext) throws IOExcepti

executable = runnerExe.getPath();

copyFileToWorkspace(MatlabConstants.RUN_EXE_MAC, new File(runnerExe.getPath()));
if (System.getProperty("os.arch").equals("aarch64")) {
copyFileToWorkspace(MatlabConstants.RUN_EXE_MACA, new File(runnerExe.getPath()));
} else {
copyFileToWorkspace(MatlabConstants.RUN_EXE_MACI, new File(runnerExe.getPath()));
}
} else {
final File runnerExe = new File(this.tempDirectory, "run-matlab-command");

Expand Down
3 changes: 2 additions & 1 deletion matlab-plugin-common/src/main/java/com/mathworks/ci/MatlabConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ public interface MatlabConstants {
String TEMP_MATLAB_FOLDER_NAME = ".matlab";
// Matlab Runner files
static final String RUN_EXE_WIN = "win64/run-matlab-command.exe";
static final String RUN_EXE_MAC = "maci64/run-matlab-command";
static final String RUN_EXE_MACA = "maca64/run-matlab-command";
static final String RUN_EXE_MACI = "maci64/run-matlab-command";
static final String RUN_EXE_LINUX = "glnxa64/run-matlab-command";
static final String MATLAB_SCRIPT_GENERATOR = "matlab-script-generator.zip";
//Test runner file prefix
Expand Down