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

Force module install

pull/659/head
Paul FIGIEL 2024-07-25 15:09:04 +02:00
parent f2250e958e
commit 5db0bb54c2
4 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist/.DS_Store vendored
View File

Binary file not shown.

18
dist/index.js vendored
View File

@ -7315,6 +7315,7 @@ class SetupMac {
if (!node_fs_1.default.existsSync(unityEditorPath.replace(/"/g, ''))) { if (!node_fs_1.default.existsSync(unityEditorPath.replace(/"/g, ''))) {
await SetupMac.installUnity(buildParameters); await SetupMac.installUnity(buildParameters);
} }
await SetupMac.ensureRequiredModuleIsInstalled(buildParameters);
await SetupMac.setEnvironmentVariables(buildParameters, actionFolder); await SetupMac.setEnvironmentVariables(buildParameters, actionFolder);
} }
static async installUnityHub(buildParameters, silent = false) { static async installUnityHub(buildParameters, silent = false) {
@ -7398,6 +7399,23 @@ class SetupMac {
} }
return moduleArgument; return moduleArgument;
} }
static async ensureRequiredModuleIsInstalled(buildParameters) {
const unityChangeset = await (0, unity_changeset_1.getUnityChangeset)(buildParameters.editorVersion);
const moduleArguments = SetupMac.getModuleParametersForTargetPlatform(buildParameters.targetPlatform);
const execArguments = [
'--',
'--headless',
'install-modules',
...['--version', buildParameters.editorVersion],
...['--changeset', unityChangeset.changeset],
...moduleArguments,
'--childModules',
];
await (0, exec_1.exec)(this.unityHubExecPath, execArguments, {
silent: true,
ignoreReturnCode: true,
});
}
static async installUnity(buildParameters, silent = false) { static async installUnity(buildParameters, silent = false) {
const unityEditorPath = `/Applications/Unity/Hub/Editor/${buildParameters.editorVersion}`; const unityEditorPath = `/Applications/Unity/Hub/Editor/${buildParameters.editorVersion}`;
const key = `Cache-MacOS-UnityEditor-With-Module-${buildParameters.targetPlatform}@${buildParameters.editorVersion}`; const key = `Cache-MacOS-UnityEditor-With-Module-${buildParameters.targetPlatform}@${buildParameters.editorVersion}`;

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

@ -20,6 +20,8 @@ class SetupMac {
await SetupMac.installUnity(buildParameters); await SetupMac.installUnity(buildParameters);
} }
await SetupMac.ensureRequiredModuleIsInstalled(buildParameters);
await SetupMac.setEnvironmentVariables(buildParameters, actionFolder); await SetupMac.setEnvironmentVariables(buildParameters, actionFolder);
} }
@ -119,6 +121,26 @@ class SetupMac {
return moduleArgument; return moduleArgument;
} }
private static async ensureRequiredModuleIsInstalled(buildParameters: BuildParameters) {
const unityChangeset = await getUnityChangeset(buildParameters.editorVersion);
const moduleArguments = SetupMac.getModuleParametersForTargetPlatform(buildParameters.targetPlatform);
const execArguments: string[] = [
'--',
'--headless',
'install-modules',
...['--version', buildParameters.editorVersion],
...['--changeset', unityChangeset.changeset],
...moduleArguments,
'--childModules',
];
await exec(this.unityHubExecPath, execArguments, {
silent: true,
ignoreReturnCode: true,
});
}
private static async installUnity(buildParameters: BuildParameters, silent = false) { private static async installUnity(buildParameters: BuildParameters, silent = false) {
const unityEditorPath = `/Applications/Unity/Hub/Editor/${buildParameters.editorVersion}`; const unityEditorPath = `/Applications/Unity/Hub/Editor/${buildParameters.editorVersion}`;
const key = `Cache-MacOS-UnityEditor-With-Module-${buildParameters.targetPlatform}@${buildParameters.editorVersion}`; const key = `Cache-MacOS-UnityEditor-With-Module-${buildParameters.targetPlatform}@${buildParameters.editorVersion}`;