Move back to process.env
							parent
							
								
									107d6a5fe3
								
							
						
					
					
						commit
						45b49c7fb7
					
				|  | @ -1328,50 +1328,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge | ||||||
|         step((generator = generator.apply(thisArg, _arguments || [])).next()); |         step((generator = generator.apply(thisArg, _arguments || [])).next()); | ||||||
|     }); |     }); | ||||||
| }; | }; | ||||||
| var __importDefault = (this && this.__importDefault) || function (mod) { |  | ||||||
|     return (mod && mod.__esModule) ? mod : { "default": mod }; |  | ||||||
| }; |  | ||||||
| Object.defineProperty(exports, "__esModule", ({ value: true })); | Object.defineProperty(exports, "__esModule", ({ value: true })); | ||||||
| const unity_changeset_1 = __webpack_require__(4635); | const unity_changeset_1 = __webpack_require__(4635); | ||||||
| const fs_1 = __importDefault(__webpack_require__(35747)); |  | ||||||
| class SetupMac { | class SetupMac { | ||||||
|     //static unityHubPath = `/Applications/Unity\\\\ Hub.app/Contents/MacOS/Unity\\\\ Hub`;
 |  | ||||||
|     static setup(buildParameters, actionFolder) { |     static setup(buildParameters, actionFolder) { | ||||||
|         return __awaiter(this, void 0, void 0, function* () { |         return __awaiter(this, void 0, void 0, function* () { | ||||||
|             const unityChangeset = yield unity_changeset_1.getUnityChangeset(buildParameters.version); |             const unityChangeset = yield unity_changeset_1.getUnityChangeset(buildParameters.version); | ||||||
|             const environmentContent = `SCRIPT_DIRECTORY=${actionFolder}/platforms/mac/
 |             //Need to set environment variables from here because we execute
 | ||||||
|     UNITY_VERSION=${buildParameters.version} |             //the scripts on the host for mac
 | ||||||
|     UNITY_CHANGESET=${unityChangeset.changeset} |             process.env.SCRIPT_DIRECTORY = `${actionFolder}/platforms/mac/`; | ||||||
|     UNITY_SERIAL=${buildParameters.unitySerial} |             process.env.UNITY_VERSION = buildParameters.version; | ||||||
|     PROJECT_PATH=${buildParameters.projectPath} |             process.env.UNITY_CHANGESET = unityChangeset.changeset; | ||||||
|     BUILD_TARGET=${buildParameters.platform} |             process.env.UNITY_SERIAL = buildParameters.unitySerial; | ||||||
|     BUILD_NAME=${buildParameters.buildName} |             process.env.PROJECT_PATH = buildParameters.projectPath; | ||||||
|     BUILD_PATH=${buildParameters.buildPath} |             process.env.BUILD_TARGET = buildParameters.platform; | ||||||
|     BUILD_FILE=${buildParameters.buildFile} |             process.env.BUILD_NAME = buildParameters.buildName; | ||||||
|     BUILD_METHOD=${buildParameters.buildMethod} |             process.env.BUILD_PATH = buildParameters.buildPath; | ||||||
|     VERSION=${buildParameters.buildVersion} |             process.env.BUILD_FILE = buildParameters.buildFile; | ||||||
|     ANDROID_VERSION_CODE=${buildParameters.androidVersionCode} |             process.env.BUILD_METHOD = buildParameters.buildMethod; | ||||||
|     ANDROID_KEYSTORE_NAME=${buildParameters.androidKeystoreName} |             process.env.VERSION = buildParameters.buildVersion; | ||||||
|     ANDROID_KEYSTORE_BASE64=${buildParameters.androidKeystoreBase64} |             process.env.ANDROID_VERSION_CODE = buildParameters.androidVersionCode; | ||||||
|     ANDROID_KEYSTORE_PASS=${buildParameters.androidKeystorePass} |             process.env.ANDROID_KEYSTORE_NAME = buildParameters.androidKeystoreName; | ||||||
|     ANDROID_KEYALIAS_NAME=${buildParameters.androidKeyaliasName} |             process.env.ANDROID_KEYSTORE_BASE64 = buildParameters.androidKeystoreBase64; | ||||||
|     ANDROID_KEYALIAS_PASS=${buildParameters.androidKeyaliasPass} |             process.env.ANDROID_KEYSTORE_PASS = buildParameters.androidKeystorePass; | ||||||
|     ANDROID_TARGET_SDK_VERSION=${buildParameters.androidTargetSdkVersion} |             process.env.ANDROID_KEYALIAS_NAME = buildParameters.androidKeyaliasName; | ||||||
|     ANDROID_SDK_MANAGER_PARAMETERS=${buildParameters.androidSdkManagerParameters} |             process.env.ANDROID_KEYALIAS_PASS = buildParameters.androidKeyaliasPass; | ||||||
|     CUSTOM_PARAMETERS=${buildParameters.customParameters} |             process.env.ANDROID_TARGET_SDK_VERSION = buildParameters.androidTargetSdkVersion; | ||||||
|     CHOWN_FILES_TO=${buildParameters.chownFilesTo}`;
 |             process.env.ANDROID_SDK_MANAGER_PARAMETERS = buildParameters.androidSdkManagerParameters; | ||||||
|             process.env.RANDOM_VARIABLE = 'Hi there'; |             process.env.CUSTOM_PARAMETERS = buildParameters.customParameters; | ||||||
|             //Since we are using shell scripts on the host, we need to set the environment variables from here
 |             process.env.CHOWN_FILES_TO = buildParameters.chownFilesTo; | ||||||
|             try { |  | ||||||
|                 console.log(environmentContent); |  | ||||||
|                 console.log(`${process.env.RUNNER_TEMP}/build.env`); |  | ||||||
|                 fs_1.default.writeFileSync(`${process.env.RUNNER_TEMP}/build.env`, environmentContent); |  | ||||||
|                 console.log('Wrote file'); |  | ||||||
|                 console.log(fs_1.default.readFileSync(`${process.env.RUNNER_TEMP}/build.env`)); |  | ||||||
|             } |  | ||||||
|             catch (error) { |  | ||||||
|                 console.log(error); |  | ||||||
|             } |  | ||||||
|         }); |         }); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							|  | @ -1,7 +1,4 @@ | ||||||
| #!/usr/bin/env bash | #!/usr/bin/env bash | ||||||
| 
 |  | ||||||
| # Set environment variables for the build |  | ||||||
| set -o allexport; source $RUNNER_TEMP/build.env; set +o allexport; |  | ||||||
| printenv | printenv | ||||||
| # | # | ||||||
| # Run steps | # Run steps | ||||||
|  |  | ||||||
|  | @ -1,47 +1,33 @@ | ||||||
| /* eslint no-console: "off" */ |  | ||||||
| import { BuildParameters } from '..'; | import { BuildParameters } from '..'; | ||||||
| import { getUnityChangeset } from 'unity-changeset'; | import { getUnityChangeset } from 'unity-changeset'; | ||||||
| import fs from 'fs'; |  | ||||||
| 
 | 
 | ||||||
| class SetupMac { | class SetupMac { | ||||||
|   //static unityHubPath = `/Applications/Unity\\\\ Hub.app/Contents/MacOS/Unity\\\\ Hub`;
 |  | ||||||
| 
 |  | ||||||
|   public static async setup(buildParameters: BuildParameters, actionFolder: string) { |   public static async setup(buildParameters: BuildParameters, actionFolder: string) { | ||||||
|     const unityChangeset = await getUnityChangeset(buildParameters.version); |     const unityChangeset = await getUnityChangeset(buildParameters.version); | ||||||
| 
 | 
 | ||||||
|     const environmentContent = `SCRIPT_DIRECTORY=${actionFolder}/platforms/mac/
 |     //Need to set environment variables from here because we execute
 | ||||||
|     UNITY_VERSION=${buildParameters.version} |     //the scripts on the host for mac
 | ||||||
|     UNITY_CHANGESET=${unityChangeset.changeset} |     process.env.SCRIPT_DIRECTORY = `${actionFolder}/platforms/mac/`; | ||||||
|     UNITY_SERIAL=${buildParameters.unitySerial} |     process.env.UNITY_VERSION = buildParameters.version; | ||||||
|     PROJECT_PATH=${buildParameters.projectPath} |     process.env.UNITY_CHANGESET = unityChangeset.changeset; | ||||||
|     BUILD_TARGET=${buildParameters.platform} |     process.env.UNITY_SERIAL = buildParameters.unitySerial; | ||||||
|     BUILD_NAME=${buildParameters.buildName} |     process.env.PROJECT_PATH = buildParameters.projectPath; | ||||||
|     BUILD_PATH=${buildParameters.buildPath} |     process.env.BUILD_TARGET = buildParameters.platform; | ||||||
|     BUILD_FILE=${buildParameters.buildFile} |     process.env.BUILD_NAME = buildParameters.buildName; | ||||||
|     BUILD_METHOD=${buildParameters.buildMethod} |     process.env.BUILD_PATH = buildParameters.buildPath; | ||||||
|     VERSION=${buildParameters.buildVersion} |     process.env.BUILD_FILE = buildParameters.buildFile; | ||||||
|     ANDROID_VERSION_CODE=${buildParameters.androidVersionCode} |     process.env.BUILD_METHOD = buildParameters.buildMethod; | ||||||
|     ANDROID_KEYSTORE_NAME=${buildParameters.androidKeystoreName} |     process.env.VERSION = buildParameters.buildVersion; | ||||||
|     ANDROID_KEYSTORE_BASE64=${buildParameters.androidKeystoreBase64} |     process.env.ANDROID_VERSION_CODE = buildParameters.androidVersionCode; | ||||||
|     ANDROID_KEYSTORE_PASS=${buildParameters.androidKeystorePass} |     process.env.ANDROID_KEYSTORE_NAME = buildParameters.androidKeystoreName; | ||||||
|     ANDROID_KEYALIAS_NAME=${buildParameters.androidKeyaliasName} |     process.env.ANDROID_KEYSTORE_BASE64 = buildParameters.androidKeystoreBase64; | ||||||
|     ANDROID_KEYALIAS_PASS=${buildParameters.androidKeyaliasPass} |     process.env.ANDROID_KEYSTORE_PASS = buildParameters.androidKeystorePass; | ||||||
|     ANDROID_TARGET_SDK_VERSION=${buildParameters.androidTargetSdkVersion} |     process.env.ANDROID_KEYALIAS_NAME = buildParameters.androidKeyaliasName; | ||||||
|     ANDROID_SDK_MANAGER_PARAMETERS=${buildParameters.androidSdkManagerParameters} |     process.env.ANDROID_KEYALIAS_PASS = buildParameters.androidKeyaliasPass; | ||||||
|     CUSTOM_PARAMETERS=${buildParameters.customParameters} |     process.env.ANDROID_TARGET_SDK_VERSION = buildParameters.androidTargetSdkVersion; | ||||||
|     CHOWN_FILES_TO=${buildParameters.chownFilesTo}`;
 |     process.env.ANDROID_SDK_MANAGER_PARAMETERS = buildParameters.androidSdkManagerParameters; | ||||||
|     process.env.RANDOM_VARIABLE = 'Hi there'; |     process.env.CUSTOM_PARAMETERS = buildParameters.customParameters; | ||||||
| 
 |     process.env.CHOWN_FILES_TO = buildParameters.chownFilesTo; | ||||||
|     //Since we are using shell scripts on the host, we need to set the environment variables from here
 |  | ||||||
|     try { |  | ||||||
|       console.log(environmentContent); |  | ||||||
|       console.log(`${process.env.RUNNER_TEMP}/build.env`); |  | ||||||
|       fs.writeFileSync(`${process.env.RUNNER_TEMP}/build.env`, environmentContent); |  | ||||||
|       console.log('Wrote file'); |  | ||||||
|       console.log(fs.readFileSync(`${process.env.RUNNER_TEMP}/build.env`)); |  | ||||||
|     } catch (error) { |  | ||||||
|       console.log(error); |  | ||||||
|     } |  | ||||||
|   } |   } | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue