actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve mac unity setup steps (#501) 

* Improve mac unity setup steps

* Remove silent flag on hub install

---------

Co-authored-by: David Finol <davidmfinol@gmail.com>
pull/499/head
AndrewKahr 2023-02-09 10:24:15 -08:00 committed by GitHub
parent 584c0366c6
commit fb5b03c3b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dist/index.js generated vendored
View File

@ -7433,9 +7433,10 @@ class SetupMac {
static setup(buildParameters, actionFolder) {
return __awaiter(this, void 0, void 0, function* () {
const unityEditorPath = `/Applications/Unity/Hub/Editor/${buildParameters.editorVersion}/Unity.app/Contents/MacOS/Unity`;
// Only install unity if the editor doesn't already exist
if (!fs_1.default.existsSync(unityEditorPath)) {
if (!fs_1.default.existsSync(this.unityHubPath)) {
yield SetupMac.installUnityHub();
}
if (!fs_1.default.existsSync(unityEditorPath)) {
yield SetupMac.installUnity(buildParameters);
}
yield SetupMac.setEnvironmentVariables(buildParameters, actionFolder);
@ -7464,12 +7465,20 @@ class SetupMac {
case 'iOS':
command += `--module ios `;
break;
case 'tvOS':
command += '--module tvos ';
break;
case 'StandaloneOSX':
command += `--module mac-il2cpp `;
break;
case 'android':
case 'Android':
command += `--module android `;
break;
case 'WebGL':
command += '--module webgl ';
break;
default:
throw new Error(`Unsupported module for target platform: ${buildParameters.targetPlatform}.`);
}
command += `--childModules`;
// Ignoring return code because the log seems to overflow the internal buffer which triggers

2
dist/index.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

16
src/model/platform-setup/setup-mac.ts
View File

@ -9,9 +9,11 @@ class SetupMac {
public static async setup(buildParameters: BuildParameters, actionFolder: string) {
const unityEditorPath = `/Applications/Unity/Hub/Editor/${buildParameters.editorVersion}/Unity.app/Contents/MacOS/Unity`;
// Only install unity if the editor doesn't already exist
if (!fs.existsSync(unityEditorPath)) {
if (!fs.existsSync(this.unityHubPath)) {
await SetupMac.installUnityHub();
}
if (!fs.existsSync(unityEditorPath)) {
await SetupMac.installUnity(buildParameters);
}
@ -40,12 +42,20 @@ class SetupMac {
case 'iOS':
command += `--module ios `;
break;
case 'tvOS':
command += '--module tvos ';
break;
case 'StandaloneOSX':
command += `--module mac-il2cpp `;
break;
case 'android':
case 'Android':
command += `--module android `;
break;
case 'WebGL':
command += '--module webgl ';
break;
default:
throw new Error(`Unsupported module for target platform: ${buildParameters.targetPlatform}.`);
}
command += `--childModules`;