pull/496/head
Frostebite 2023-03-06 15:59:57 +00:00
parent c33cae93f2
commit cecb7bf6ae
2 changed files with 11 additions and 11 deletions

20
dist/index.js generated vendored
View File

@ -1088,6 +1088,11 @@ class CloudRunner {
return __awaiter(this, void 0, void 0, function* () {
yield CloudRunner.setup(buildParameters);
try {
if (!CloudRunner.buildParameters.isCliMode)
core.startGroup('Setup shared cloud runner resources');
yield CloudRunner.Provider.setupWorkflow(CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters, CloudRunner.buildParameters.branch, CloudRunner.defaultSecrets);
if (!CloudRunner.buildParameters.isCliMode)
core.endGroup();
if (buildParameters.retainWorkspace) {
CloudRunner.lockedWorkspace = shared_workspace_locking_1.default.NewWorkspaceName();
const result = yield shared_workspace_locking_1.default.GetOrCreateLockedWorkspace(CloudRunner.lockedWorkspace, CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters);
@ -1104,11 +1109,6 @@ class CloudRunner {
CloudRunner.lockedWorkspace = undefined;
}
}
if (!CloudRunner.buildParameters.isCliMode)
core.startGroup('Setup shared cloud runner resources');
yield CloudRunner.Provider.setupWorkflow(CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters, CloudRunner.buildParameters.branch, CloudRunner.defaultSecrets);
if (!CloudRunner.buildParameters.isCliMode)
core.endGroup();
const content = Object.assign({}, CloudRunner.buildParameters);
content.gitPrivateToken = ``;
content.unitySerial = ``;
@ -4690,16 +4690,17 @@ class RemoteClient {
if (!cloud_runner_1.default.buildParameters.retainWorkspace) {
return;
}
remote_client_logger_1.RemoteClientLogger.log(`Retained Workspace: ${cloud_runner_1.default.lockedWorkspace !== undefined}`);
if (fs_1.default.existsSync(cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)) &&
fs_1.default.existsSync(cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute, `.git`)))) {
cloud_runner_logger_1.default.log(`Retained Workspace Already Exists!`);
process.chdir(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`git fetch`);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`git lfs pull`);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`git reset --hard "${cloud_runner_1.default.buildParameters.gitSha}"`);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`git checkout ${cloud_runner_1.default.buildParameters.gitSha}`);
return true;
}
remote_client_logger_1.RemoteClientLogger.log(`Retained Workspace: ${cloud_runner_1.default.lockedWorkspace !== undefined}`);
return false;
});
}
@ -4826,7 +4827,7 @@ echo "---${buildParameters.logId}"`;
}
static GetCustomHooksFromFiles(hookLifecycle) {
const results = [];
remote_client_logger_1.RemoteClientLogger.log(`GetCustomHookFiles: ${hookLifecycle}`);
// RemoteClientLogger.log(`GetCustomHookFiles: ${hookLifecycle}`);
try {
const gameCiCustomHooksPath = path_1.default.join(process.cwd(), `game-ci`, `hooks`);
const files = fs.readdirSync(gameCiCustomHooksPath);
@ -4844,7 +4845,7 @@ echo "---${buildParameters.logId}"`;
catch (error) {
remote_client_logger_1.RemoteClientLogger.log(`Failed Getting: ${hookLifecycle} \n ${JSON.stringify(error, undefined, 4)}`);
}
remote_client_logger_1.RemoteClientLogger.log(`Active Steps From Hooks: \n ${JSON.stringify(results, undefined, 4)}`);
// RemoteClientLogger.log(`Active Steps From Hooks: \n ${JSON.stringify(results, undefined, 4)}`);
return results;
}
static ConvertYamlSecrets(object) {
@ -4944,7 +4945,6 @@ const path_1 = __importDefault(__nccwpck_require__(71017));
const fs = __importStar(__nccwpck_require__(57147));
const input_1 = __importDefault(__nccwpck_require__(91933));
const cloud_runner_options_1 = __importDefault(__nccwpck_require__(96552));
const cloud_runner_logger_1 = __importDefault(__nccwpck_require__(22855));
class CloudRunnerCustomSteps {
static GetCustomStepsFromFiles(hookLifecycle) {
const results = [];
@ -5126,7 +5126,7 @@ class CloudRunnerCustomSteps {
for (const secret of step.secrets) {
if (secret.ParameterValue === undefined && process.env[secret.EnvironmentVariable] !== undefined) {
if ((_a = cloud_runner_1.default.buildParameters) === null || _a === void 0 ? void 0 : _a.cloudRunnerDebug) {
cloud_runner_logger_1.default.log(`Injecting custom step ${step.name} from env var ${secret.ParameterKey}`);
// CloudRunnerLogger.log(`Injecting custom step ${step.name} from env var ${secret.ParameterKey}`);
}
secret.ParameterValue = process.env[secret.ParameterKey] || ``;
}

2
dist/index.js.map generated vendored

File diff suppressed because one or more lines are too long