Fix formatting
							parent
							
								
									80b1d4bd11
								
							
						
					
					
						commit
						bc513b86b2
					
				|  | @ -4165,8 +4165,8 @@ class SetupMac { | ||||||
|         return __awaiter(this, void 0, void 0, function* () { |         return __awaiter(this, void 0, void 0, function* () { | ||||||
|             const command = 'brew install unity-hub'; |             const command = 'brew install unity-hub'; | ||||||
|             if (!fs_1.default.existsSync(this.unityHubPath)) { |             if (!fs_1.default.existsSync(this.unityHubPath)) { | ||||||
|                 //Ignoring return code because the log seems to overflow the internal buffer which triggers
 |                 // Ignoring return code because the log seems to overflow the internal buffer which triggers
 | ||||||
|                 //a false error
 |                 // a false error
 | ||||||
|                 const errorCode = yield exec_1.exec(command, undefined, { silent, ignoreReturnCode: true }); |                 const errorCode = yield exec_1.exec(command, undefined, { silent, ignoreReturnCode: true }); | ||||||
|                 if (errorCode) { |                 if (errorCode) { | ||||||
|                     throw new Error(`There was an error installing the Unity Editor. See logs above for details.`); |                     throw new Error(`There was an error installing the Unity Editor. See logs above for details.`); | ||||||
|  | @ -4182,8 +4182,8 @@ class SetupMac { | ||||||
|                                           --changeset ${unityChangeset.changeset} \ |                                           --changeset ${unityChangeset.changeset} \ | ||||||
|                                           --module mac-il2cpp \ |                                           --module mac-il2cpp \ | ||||||
|                                           --childModules`;
 |                                           --childModules`;
 | ||||||
|             //Ignoring return code because the log seems to overflow the internal buffer which triggers
 |             // Ignoring return code because the log seems to overflow the internal buffer which triggers
 | ||||||
|             //a false error
 |             // a false error
 | ||||||
|             const errorCode = yield exec_1.exec(command, undefined, { silent, ignoreReturnCode: true }); |             const errorCode = yield exec_1.exec(command, undefined, { silent, ignoreReturnCode: true }); | ||||||
|             if (errorCode) { |             if (errorCode) { | ||||||
|                 throw new Error(`There was an error installing the Unity Editor. See logs above for details.`); |                 throw new Error(`There was an error installing the Unity Editor. See logs above for details.`); | ||||||
|  | @ -4192,8 +4192,8 @@ class SetupMac { | ||||||
|     } |     } | ||||||
|     static setEnvironmentVariables(buildParameters, actionFolder) { |     static setEnvironmentVariables(buildParameters, actionFolder) { | ||||||
|         return __awaiter(this, void 0, void 0, function* () { |         return __awaiter(this, void 0, void 0, function* () { | ||||||
|             //Need to set environment variables from here because we execute
 |             // Need to set environment variables from here because we execute
 | ||||||
|             //the scripts on the host for mac
 |             // the scripts on the host for mac
 | ||||||
|             process.env.ACTION_FOLDER = actionFolder; |             process.env.ACTION_FOLDER = actionFolder; | ||||||
|             process.env.UNITY_VERSION = buildParameters.version; |             process.env.UNITY_VERSION = buildParameters.version; | ||||||
|             process.env.UNITY_SERIAL = buildParameters.unitySerial; |             process.env.UNITY_SERIAL = buildParameters.unitySerial; | ||||||
|  |  | ||||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										14
									
								
								src/index.ts
								
								
								
								
							
							
						
						
									
										14
									
								
								src/index.ts
								
								
								
								
							|  | @ -23,13 +23,13 @@ async function runMain() { | ||||||
|       await CloudRunner.run(buildParameters, baseImage.toString()); |       await CloudRunner.run(buildParameters, baseImage.toString()); | ||||||
|     } else { |     } else { | ||||||
|       core.info('Building locally'); |       core.info('Building locally'); | ||||||
|         await PlatformSetup.setup(buildParameters, actionFolder); |       await PlatformSetup.setup(buildParameters, actionFolder); | ||||||
|         if (process.platform === 'darwin') { |       if (process.platform === 'darwin') { | ||||||
|           MacBuilder.run(actionFolder, workspace, buildParameters); |         MacBuilder.run(actionFolder, workspace, buildParameters); | ||||||
|         } else { |       } else { | ||||||
|           builtImage = await Docker.build({ path: actionFolder, dockerfile, baseImage }); |         builtImage = await Docker.build({ path: actionFolder, dockerfile, baseImage }); | ||||||
|           await Docker.run(builtImage, { workspace, ...buildParameters }); |         await Docker.run(builtImage, { workspace, ...buildParameters }); | ||||||
|         } |       } | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     // Set output
 |     // Set output
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue