cleanup
parent
6b680913ef
commit
775d61092e
|
|
@ -267,7 +267,7 @@ class BuildParameters {
|
||||||
customJob: input_1.default.customJob,
|
customJob: input_1.default.customJob,
|
||||||
runNumber: input_1.default.runNumber,
|
runNumber: input_1.default.runNumber,
|
||||||
branch: yield input_1.default.branch(),
|
branch: yield input_1.default.branch(),
|
||||||
githubRepo: input_1.default.githubRepo,
|
githubRepo: yield input_1.default.githubRepo(),
|
||||||
remoteBuildCluster: input_1.default.cloudRunnerCluster,
|
remoteBuildCluster: input_1.default.cloudRunnerCluster,
|
||||||
awsStackName: input_1.default.awsBaseStackName,
|
awsStackName: input_1.default.awsBaseStackName,
|
||||||
gitSha: input_1.default.gitSha,
|
gitSha: input_1.default.gitSha,
|
||||||
|
|
@ -2737,6 +2737,7 @@ class BuildStep {
|
||||||
}
|
}
|
||||||
static BuildStep(image, environmentVariables, secrets) {
|
static BuildStep(image, environmentVariables, secrets) {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
|
cloud_runner_logger_1.default.logLine(` `);
|
||||||
cloud_runner_logger_1.default.logLine('Starting part 2/2 (build unity project)');
|
cloud_runner_logger_1.default.logLine('Starting part 2/2 (build unity project)');
|
||||||
return yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.runTask(cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid, image, `
|
return yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.runTask(cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid, image, `
|
||||||
export GITHUB_WORKSPACE="${cloud_runner_state_1.CloudRunnerState.repoPathFull}"
|
export GITHUB_WORKSPACE="${cloud_runner_state_1.CloudRunnerState.repoPathFull}"
|
||||||
|
|
@ -2803,6 +2804,7 @@ class SetupStep {
|
||||||
static downloadRepository(image, environmentVariables, secrets) {
|
static downloadRepository(image, environmentVariables, secrets) {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
try {
|
try {
|
||||||
|
cloud_runner_logger_1.default.logLine(` `);
|
||||||
cloud_runner_logger_1.default.logLine('Starting step 1/2 (setup game files from repository)');
|
cloud_runner_logger_1.default.logLine('Starting step 1/2 (setup game files from repository)');
|
||||||
return yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.runTask(cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid, image, `
|
return yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.runTask(cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid, image, `
|
||||||
apk update -q
|
apk update -q
|
||||||
|
|
@ -3486,8 +3488,10 @@ class Input {
|
||||||
static get region() {
|
static get region() {
|
||||||
return Input.getInput('region') || 'eu-west-2';
|
return Input.getInput('region') || 'eu-west-2';
|
||||||
}
|
}
|
||||||
static get githubRepo() {
|
static githubRepo() {
|
||||||
return Input.getInput('GITHUB_REPOSITORY') || git_repo_1.GitRepoReader.GetRemote() || 'game-ci/unity-builder';
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
|
return Input.getInput('GITHUB_REPOSITORY') || (yield git_repo_1.GitRepoReader.GetRemote()) || 'game-ci/unity-builder';
|
||||||
|
});
|
||||||
}
|
}
|
||||||
static branch() {
|
static branch() {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -98,7 +98,7 @@ class BuildParameters {
|
||||||
customJob: Input.customJob,
|
customJob: Input.customJob,
|
||||||
runNumber: Input.runNumber,
|
runNumber: Input.runNumber,
|
||||||
branch: await Input.branch(),
|
branch: await Input.branch(),
|
||||||
githubRepo: Input.githubRepo,
|
githubRepo: await Input.githubRepo(),
|
||||||
remoteBuildCluster: Input.cloudRunnerCluster,
|
remoteBuildCluster: Input.cloudRunnerCluster,
|
||||||
awsStackName: Input.awsBaseStackName,
|
awsStackName: Input.awsBaseStackName,
|
||||||
gitSha: Input.gitSha,
|
gitSha: Input.gitSha,
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ export class BuildStep implements StepInterface {
|
||||||
environmentVariables: CloudRunnerEnvironmentVariable[],
|
environmentVariables: CloudRunnerEnvironmentVariable[],
|
||||||
secrets: CloudRunnerSecret[],
|
secrets: CloudRunnerSecret[],
|
||||||
) {
|
) {
|
||||||
|
CloudRunnerLogger.logLine(` `);
|
||||||
CloudRunnerLogger.logLine('Starting part 2/2 (build unity project)');
|
CloudRunnerLogger.logLine('Starting part 2/2 (build unity project)');
|
||||||
return await CloudRunnerState.CloudRunnerProviderPlatform.runTask(
|
return await CloudRunnerState.CloudRunnerProviderPlatform.runTask(
|
||||||
CloudRunnerState.buildParams.buildGuid,
|
CloudRunnerState.buildParams.buildGuid,
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ export class SetupStep implements StepInterface {
|
||||||
secrets: CloudRunnerSecret[],
|
secrets: CloudRunnerSecret[],
|
||||||
) {
|
) {
|
||||||
try {
|
try {
|
||||||
|
CloudRunnerLogger.logLine(` `);
|
||||||
CloudRunnerLogger.logLine('Starting step 1/2 (setup game files from repository)');
|
CloudRunnerLogger.logLine('Starting step 1/2 (setup game files from repository)');
|
||||||
return await CloudRunnerState.CloudRunnerProviderPlatform.runTask(
|
return await CloudRunnerState.CloudRunnerProviderPlatform.runTask(
|
||||||
CloudRunnerState.buildParams.buildGuid,
|
CloudRunnerState.buildParams.buildGuid,
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,8 @@ class Input {
|
||||||
static get region(): string {
|
static get region(): string {
|
||||||
return Input.getInput('region') || 'eu-west-2';
|
return Input.getInput('region') || 'eu-west-2';
|
||||||
}
|
}
|
||||||
static get githubRepo(): string {
|
static async githubRepo() {
|
||||||
return Input.getInput('GITHUB_REPOSITORY') || GitRepoReader.GetRemote() || 'game-ci/unity-builder';
|
return Input.getInput('GITHUB_REPOSITORY') || (await GitRepoReader.GetRemote()) || 'game-ci/unity-builder';
|
||||||
}
|
}
|
||||||
static async branch() {
|
static async branch() {
|
||||||
if (await GitRepoReader.GetBranch()) {
|
if (await GitRepoReader.GetBranch()) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue