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

Merge branch 'main' into feature/support-visionos 

# Conflicts:
#	dist/index.js.map
pull/710/head
Daniel Lupiañez Casares 2025-06-07 19:47:17 +02:00
parent 43ff407d42 3b26780ddf
commit cf36c13713
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/index.js generated vendored
View File

@ -6614,8 +6614,8 @@ class ImageTag {
case platform_1.default.types.XboxOne: case platform_1.default.types.XboxOne:
return windows; return windows;
case platform_1.default.types.tvOS: case platform_1.default.types.tvOS:
if (process.platform !== 'win32') { if (process.platform !== 'win32' && process.platform !== 'darwin') {
throw new Error(`tvOS can only be built on a windows base OS`); throw new Error(`tvOS can only be built on Windows or macOS base OS`);
} }
return tvos; return tvos;
case platform_1.default.types.VisionOS: case platform_1.default.types.VisionOS:
@ -7402,7 +7402,7 @@ class SetupMac {
moduleArgument.push('--module', 'ios'); moduleArgument.push('--module', 'ios');
break; break;
case 'tvOS': case 'tvOS':
moduleArgument.push('--module', 'tvos'); moduleArgument.push('--module', 'appletv');
break; break;
case 'VisionOS': case 'VisionOS':
moduleArgument.push('--module', 'visionos'); moduleArgument.push('--module', 'visionos');

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

File diff suppressed because one or more lines are too long

4
src/model/image-tag.ts
View File

@ -150,8 +150,8 @@ class ImageTag {
case Platform.types.XboxOne: case Platform.types.XboxOne:
return windows; return windows;
case Platform.types.tvOS: case Platform.types.tvOS:
if (process.platform !== 'win32') { if (process.platform !== 'win32' && process.platform !== 'darwin') {
throw new Error(`tvOS can only be built on a windows base OS`); throw new Error(`tvOS can only be built on Windows or macOS base OS`);
} }
return tvos; return tvos;

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

@ -101,7 +101,7 @@ class SetupMac {
moduleArgument.push('--module', 'ios'); moduleArgument.push('--module', 'ios');
break; break;
case 'tvOS': case 'tvOS':
moduleArgument.push('--module', 'tvos'); moduleArgument.push('--module', 'appletv');
break; break;
case 'VisionOS': case 'VisionOS':
moduleArgument.push('--module', 'visionos'); moduleArgument.push('--module', 'visionos');