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

Remove temporary geck fix, make sure chmod is not called on Windows #124

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Remove temporary geck fix, make sure chmod is not called on Windows #124

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9918121
Remove temporary geck fix, make sure chmod is not called on Windows
Aug 28, 2024
80640a3
Remove destination folder if mpm fails
Sep 3, 2024
b410805
Remove potentially poisoned MATLAB intall when mpm fails
Sep 4, 2024
b50a758
Merge pull request #125 from matlab-actions/cache_revert
sameagen-MW Sep 5, 2024
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
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions src/matlab.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,11 @@ export async function setupBatch(platform: string, architecture: string) {
let matlabBatch: string = await tc.downloadTool(matlabBatchUrl);
let cachedPath = await tc.cacheFile(matlabBatch, `matlab-batch${matlabBatchExt}`, "matlab-batch", "v1");
core.addPath(cachedPath);
const exitCode = await exec.exec(`chmod +x ${path.join(cachedPath, 'matlab-batch'+matlabBatchExt)}`);
if (exitCode !== 0) {
return Promise.reject(Error("Unable to make matlab-batch executable."));
if (platform !== "win32") {
const exitCode = await exec.exec(`chmod +x ${path.join(cachedPath, 'matlab-batch'+matlabBatchExt)}`);
if (exitCode !== 0) {
return Promise.reject(Error("Unable to make matlab-batch executable."));
}
}
return
}
Expand Down
9 changes: 5 additions & 4 deletions src/mpm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ export async function setup(platform: string, architecture: string): Promise<str
} else {
mpmUrl = properties.mpmRootUrl + "maca64/mpm";
}
await exec.exec(`sudo launchctl limit maxfiles 65536 200000`, undefined, {ignoreReturnCode: true}); // g3185941
break;
default:
return Promise.reject(Error(`This action is not supported on ${platform} runners using the ${architecture} architecture.`));
Expand All @@ -39,9 +38,11 @@ export async function setup(platform: string, architecture: string): Promise<str
let mpmDest = path.join(runner_temp, `mpm${ext}`);
let mpm: string = await tc.downloadTool(mpmUrl, mpmDest);

const exitCode = await exec.exec(`chmod +x "${mpm}"`);
if (exitCode !== 0) {
return Promise.reject(Error("Unable to set up mpm."));
if (platform !== "win32") {
const exitCode = await exec.exec(`chmod +x "${mpm}"`);
if (exitCode !== 0) {
return Promise.reject(Error("Unable to set up mpm."));
}
}
return mpm
}
Expand Down