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

fix

pull/310/head
Frostebite 2021-12-30 18:47:01 +00:00
parent 91a64fcf60
commit 1202bcd7d1
16 changed files with 62 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
dist/index.js vendored
View File

@ -219,6 +219,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
const nanoid_1 = __webpack_require__(39140);
const android_versioning_1 = __importDefault(__webpack_require__(43059));
const cloud_runner_constants_1 = __importDefault(__webpack_require__(91311));
const cloud_runner_namespace_1 = __importDefault(__webpack_require__(63287));
const input_1 = __importDefault(__webpack_require__(91933));
const platform_1 = __importDefault(__webpack_require__(9707));
const unity_versioning_1 = __importDefault(__webpack_require__(17146));
@ -273,6 +274,7 @@ class BuildParameters {
awsStackName: input_1.default.awsBaseStackName,
gitSha: input_1.default.gitSha,
logId: nanoid_1.customAlphabet(cloud_runner_constants_1.default.alphabet, 9)(),
buildGuid: cloud_runner_namespace_1.default.generateBuildName(input_1.default.runNumber, input_1.default.targetPlatform),
};
});
}
@ -1322,7 +1324,7 @@ class AWSTaskRunner {
}
message = `[${cloud_runner_statics_1.CloudRunnerStatics.logPrefix}] ${message}`;
if (cloud_runner_state_1.CloudRunnerState.buildParams.logToFile) {
fs_1.default.appendFileSync(`${cloud_runner_state_1.CloudRunnerState.buildGuid}-outputfile.txt`, `${message}\n`);
fs_1.default.appendFileSync(`${cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid}-outputfile.txt`, `${message}\n`);
}
cloud_runner_logger_1.default.log(message);
}
@ -1581,6 +1583,7 @@ const cloud_runner_logger_1 = __importDefault(__webpack_require__(22855));
const cloud_runner_step_state_1 = __webpack_require__(64854);
const workflow_composition_root_1 = __webpack_require__(54204);
const cloud_runner_error_1 = __webpack_require__(2600);
const task_parameter_serializer_1 = __webpack_require__(35346);
class CloudRunner {
static setup(buildParameters) {
cloud_runner_logger_1.default.setup();
@ -1604,9 +1607,9 @@ class CloudRunner {
return __awaiter(this, void 0, void 0, function* () {
CloudRunner.setup(buildParameters);
try {
yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.setupSharedResources(cloud_runner_state_1.CloudRunnerState.buildGuid, cloud_runner_state_1.CloudRunnerState.buildParams, cloud_runner_state_1.CloudRunnerState.branchName, cloud_runner_state_1.CloudRunnerState.defaultSecrets);
yield new workflow_composition_root_1.WorkflowCompositionRoot().run(new cloud_runner_step_state_1.CloudRunnerStepState(baseImage, cloud_runner_state_1.CloudRunnerState.readBuildEnvironmentVariables(), cloud_runner_state_1.CloudRunnerState.defaultSecrets));
yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.cleanupSharedResources(cloud_runner_state_1.CloudRunnerState.buildGuid, cloud_runner_state_1.CloudRunnerState.buildParams, cloud_runner_state_1.CloudRunnerState.branchName, cloud_runner_state_1.CloudRunnerState.defaultSecrets);
yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.setupSharedResources(cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid, cloud_runner_state_1.CloudRunnerState.buildParams, cloud_runner_state_1.CloudRunnerState.branchName, cloud_runner_state_1.CloudRunnerState.defaultSecrets);
yield new workflow_composition_root_1.WorkflowCompositionRoot().run(new cloud_runner_step_state_1.CloudRunnerStepState(baseImage, task_parameter_serializer_1.TaskParameterSerializer.readBuildEnvironmentVariables(), cloud_runner_state_1.CloudRunnerState.defaultSecrets));
yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.cleanupSharedResources(cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid, cloud_runner_state_1.CloudRunnerState.buildParams, cloud_runner_state_1.CloudRunnerState.branchName, cloud_runner_state_1.CloudRunnerState.defaultSecrets);
}
catch (error) {
yield cloud_runner_error_1.CloudRunnerError.handleException(error);
@ -1666,7 +1669,7 @@ class CloudRunnerError {
return __awaiter(this, void 0, void 0, function* () {
cloud_runner_logger_1.default.error(JSON.stringify(error, undefined, 4));
core.setFailed('Cloud Runner failed');
yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.cleanupSharedResources(cloud_runner_state_1.CloudRunnerState.buildGuid, cloud_runner_state_1.CloudRunnerState.buildParams, cloud_runner_state_1.CloudRunnerState.branchName, cloud_runner_state_1.CloudRunnerState.defaultSecrets);
yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.cleanupSharedResources(cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid, cloud_runner_state_1.CloudRunnerState.buildParams, cloud_runner_state_1.CloudRunnerState.branchName, cloud_runner_state_1.CloudRunnerState.defaultSecrets);
});
}
}
@ -2309,7 +2312,7 @@ class KubernetesTaskRunner {
let message = chunk.toString();
message = `[${cloud_runner_statics_1.CloudRunnerStatics.logPrefix}] ${message}`;
if (cloud_runner_state_1.CloudRunnerState.buildParams.logToFile) {
fs_1.default.appendFileSync(`${cloud_runner_state_1.CloudRunnerState.buildGuid}-outputfile.txt`, `${message}\n`);
fs_1.default.appendFileSync(`${cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid}-outputfile.txt`, `${message}\n`);
}
logCallback(message);
next();
@ -2524,7 +2527,7 @@ class TaskParameterSerializer {
},
{
name: 'GITHUB_WORKSPACE',
value: `/${cloud_runner_state_1.CloudRunnerState.buildVolumeFolder}/${cloud_runner_state_1.CloudRunnerState.buildGuid}/${cloud_runner_state_1.CloudRunnerState.repositoryFolder}/`,
value: `/${cloud_runner_state_1.CloudRunnerState.buildVolumeFolder}/${cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid}/${cloud_runner_state_1.CloudRunnerState.repositoryFolder}/`,
},
{
name: 'BUILD_TARGET',
@ -2558,8 +2561,8 @@ class TaskParameterSerializer {
});
}
array.push({ name: 'buildParameters', value: JSON.stringify(cloud_runner_state_1.CloudRunnerState.buildParams) }, {
name: Object.keys(cloud_runner_state_1.CloudRunnerState.buildGuid)[0],
value: cloud_runner_state_1.CloudRunnerState.buildGuid,
name: `buildGuid`,
value: cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid,
});
return array;
}
@ -2607,20 +2610,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.CloudRunnerState = void 0;
const path_1 = __importDefault(__webpack_require__(85622));
const cloud_runner_namespace_1 = __importDefault(__webpack_require__(63287));
const task_parameter_serializer_1 = __webpack_require__(35346);
class CloudRunnerState {
static setup(buildParameters) {
CloudRunnerState.buildParams = buildParameters;
if (CloudRunnerState.buildGuid === undefined) {
CloudRunnerState.buildGuid = cloud_runner_namespace_1.default.generateBuildName(CloudRunnerState.runNumber, buildParameters.platform);
}
}
static get branchName() {
return CloudRunnerState.buildParams.branch;
}
static get buildPathFull() {
return path_1.default.join(`/`, CloudRunnerState.buildVolumeFolder, CloudRunnerState.buildGuid);
return path_1.default.join(`/`, CloudRunnerState.buildVolumeFolder, CloudRunnerState.buildParams.buildGuid);
}
static get builderPathFull() {
return path_1.default.join(CloudRunnerState.buildPathFull, `builder`);
@ -2667,16 +2665,6 @@ class CloudRunnerState {
static get cacheFolder() {
return 'cache';
}
static readBuildEnvironmentVariables() {
return task_parameter_serializer_1.TaskParameterSerializer.readBuildEnvironmentVariables();
}
static get runNumber() {
const runNumber = CloudRunnerState.buildParams.runNumber;
if (!runNumber || runNumber === '') {
throw new Error('no run number found, exiting');
}
return runNumber;
}
}
exports.CloudRunnerState = CloudRunnerState;
CloudRunnerState.repositoryFolder = 'repo';
@ -2733,7 +2721,7 @@ class BuildStep {
static BuildStep(image, environmentVariables, secrets) {
return __awaiter(this, void 0, void 0, function* () {
cloud_runner_logger_1.default.logLine('Starting part 2/2 (build unity project)');
yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.runTask(cloud_runner_state_1.CloudRunnerState.buildGuid, image, `
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}"
cp -r "${cloud_runner_state_1.CloudRunnerState.builderPathFull}/dist/default-build-script/" "/UnityBuilderAction"
cp -r "${cloud_runner_state_1.CloudRunnerState.builderPathFull}/dist/entrypoint.sh" "/entrypoint.sh"
@ -2744,13 +2732,13 @@ class BuildStep {
apt-get update
apt-get install -y -q zip
cd "${cloud_runner_state_1.CloudRunnerState.libraryFolderFull}/.."
zip -r "lib-$buildGuid.zip" "./Library"
mv "lib-$buildGuid.zip" "${cloud_runner_state_1.CloudRunnerState.cacheFolderFull}/lib"
zip -r "lib-$BUILD_GUID.zip" "./Library"
mv "lib-$BUILD_GUID.zip" "${cloud_runner_state_1.CloudRunnerState.cacheFolderFull}/lib"
ls -lh "${cloud_runner_state_1.CloudRunnerState.cacheFolderFull}/lib"
cd "${cloud_runner_state_1.CloudRunnerState.repoPathFull}"
ls -lh "${cloud_runner_state_1.CloudRunnerState.repoPathFull}"
zip -r "build-$buildGuid.zip" "./${cloud_runner_state_1.CloudRunnerState.buildParams.buildPath}"
mv "build-$buildGuid.zip" "${cloud_runner_state_1.CloudRunnerState.cacheFolderFull}/build-$buildGuid.zip"
zip -r "build-$BUILD_GUID.zip" "./${cloud_runner_state_1.CloudRunnerState.buildParams.buildPath}"
mv "build-$BUILD_GUID.zip" "${cloud_runner_state_1.CloudRunnerState.cacheFolderFull}/build-$BUILD_GUID.zip"
ls ${cloud_runner_state_1.CloudRunnerState.cacheFolderFull}/lib
echo " "
ls
@ -2799,7 +2787,7 @@ class SetupStep {
return __awaiter(this, void 0, void 0, function* () {
try {
cloud_runner_logger_1.default.logLine('Starting step 1/2 download game files from repository, try to use cache');
yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.runTask(cloud_runner_state_1.CloudRunnerState.buildGuid, image, `
yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.runTask(cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid, image, `
apk update -q
apk add unzip zip git-lfs jq tree nodejs -q
export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
@ -2841,6 +2829,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.BuildAutomationWorkflow = void 0;
const cloud_runner_logger_1 = __importDefault(__webpack_require__(22855));
const task_parameter_serializer_1 = __webpack_require__(35346);
const cloud_runner_state_1 = __webpack_require__(70912);
const cloud_runner_step_state_1 = __webpack_require__(64854);
const build_step_1 = __webpack_require__(91491);
@ -2861,13 +2850,13 @@ class BuildAutomationWorkflow {
return __awaiter(this, void 0, void 0, function* () {
try {
cloud_runner_logger_1.default.log(`Cloud Runner is running standard build automation`);
yield new setup_step_1.SetupStep().run(new cloud_runner_step_state_1.CloudRunnerStepState('alpine/git', cloud_runner_state_1.CloudRunnerState.readBuildEnvironmentVariables(), cloud_runner_state_1.CloudRunnerState.defaultSecrets));
yield new setup_step_1.SetupStep().run(new cloud_runner_step_state_1.CloudRunnerStepState('alpine/git', task_parameter_serializer_1.TaskParameterSerializer.readBuildEnvironmentVariables(), cloud_runner_state_1.CloudRunnerState.defaultSecrets));
cloud_runner_logger_1.default.logWithTime('Download repository step time');
if (cloud_runner_state_1.CloudRunnerState.buildParams.preBuildSteps !== '') {
yield custom_workflow_1.CustomWorkflow.runCustomJob(cloud_runner_state_1.CloudRunnerState.buildParams.preBuildSteps);
}
cloud_runner_logger_1.default.logWithTime('Pre build step(s) time');
yield new build_step_1.BuildStep().run(new cloud_runner_step_state_1.CloudRunnerStepState(baseImage, cloud_runner_state_1.CloudRunnerState.readBuildEnvironmentVariables(), cloud_runner_state_1.CloudRunnerState.defaultSecrets));
yield new build_step_1.BuildStep().run(new cloud_runner_step_state_1.CloudRunnerStepState(baseImage, task_parameter_serializer_1.TaskParameterSerializer.readBuildEnvironmentVariables(), cloud_runner_state_1.CloudRunnerState.defaultSecrets));
cloud_runner_logger_1.default.logWithTime('Build time');
if (cloud_runner_state_1.CloudRunnerState.buildParams.postBuildSteps !== '') {
yield custom_workflow_1.CustomWorkflow.runCustomJob(cloud_runner_state_1.CloudRunnerState.buildParams.postBuildSteps);
@ -2909,6 +2898,7 @@ const cloud_runner_logger_1 = __importDefault(__webpack_require__(22855));
const cloud_runner_state_1 = __webpack_require__(70912);
const yaml_1 = __importDefault(__webpack_require__(13552));
const __1 = __webpack_require__(41359);
const task_parameter_serializer_1 = __webpack_require__(35346);
class CustomWorkflow {
static runCustomJob(buildSteps) {
return __awaiter(this, void 0, void 0, function* () {
@ -2925,7 +2915,7 @@ class CustomWorkflow {
};
return secret;
});
yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.runTask(cloud_runner_state_1.CloudRunnerState.buildGuid, step['image'], step['commands'], `/${cloud_runner_state_1.CloudRunnerState.buildVolumeFolder}`, `/${cloud_runner_state_1.CloudRunnerState.buildVolumeFolder}`, cloud_runner_state_1.CloudRunnerState.readBuildEnvironmentVariables(), [...cloud_runner_state_1.CloudRunnerState.defaultSecrets, ...stepSecrets]);
yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.runTask(cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid, step['image'], step['commands'], `/${cloud_runner_state_1.CloudRunnerState.buildVolumeFolder}`, `/${cloud_runner_state_1.CloudRunnerState.buildVolumeFolder}`, task_parameter_serializer_1.TaskParameterSerializer.readBuildEnvironmentVariables(), [...cloud_runner_state_1.CloudRunnerState.defaultSecrets, ...stepSecrets]);
}
}
catch (error) {
@ -2981,7 +2971,7 @@ class EphemeralGitHubRunnerWorkflow {
try {
cloud_runner_logger_1.default.log(`Cloud Runner is running in ephemeral GitHub runner mode`);
const installAndStartRunner = ' cd ../.. && ls && mkdir actions-runner && cd actions-runner && curl -O -L https://github.com/actions/runner/releases/download/v2.283.1/actions-runner-linux-x64-2.283.1.tar.gz && tar xzf ./actions-runner-linux-x64-2.283.1.tar.gz';
yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.runTask(cloud_runner_state_1.CloudRunnerState.buildGuid, image, installAndStartRunner, `/runner`, `/runner`, environmentVariables, secrets);
yield cloud_runner_state_1.CloudRunnerState.CloudRunnerProviderPlatform.runTask(cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid, image, installAndStartRunner, `/runner`, `/runner`, environmentVariables, secrets);
}
catch (error) {
throw error;
@ -3020,6 +3010,7 @@ const custom_workflow_1 = __webpack_require__(3786);
const ephemeral_github_runner_workflow_1 = __webpack_require__(37092);
const build_automation_workflow_1 = __webpack_require__(94655);
const cloud_runner_logger_1 = __importDefault(__webpack_require__(22855));
const task_parameter_serializer_1 = __webpack_require__(35346);
class WorkflowCompositionRoot {
run(cloudRunnerStepState) {
return __awaiter(this, void 0, void 0, function* () {
@ -3036,13 +3027,13 @@ class WorkflowCompositionRoot {
try {
cloud_runner_logger_1.default.log(`Workflow specified: ${cloud_runner_state_1.CloudRunnerState.buildParams.customJob}`);
if (cloud_runner_state_1.CloudRunnerState.buildParams.customJob === '') {
yield new build_automation_workflow_1.BuildAutomationWorkflow().run(new cloud_runner_step_state_1.CloudRunnerStepState(baseImage, cloud_runner_state_1.CloudRunnerState.readBuildEnvironmentVariables(), cloud_runner_state_1.CloudRunnerState.defaultSecrets));
yield new build_automation_workflow_1.BuildAutomationWorkflow().run(new cloud_runner_step_state_1.CloudRunnerStepState(baseImage, task_parameter_serializer_1.TaskParameterSerializer.readBuildEnvironmentVariables(), cloud_runner_state_1.CloudRunnerState.defaultSecrets));
}
else if (cloud_runner_state_1.CloudRunnerState.buildParams.customJob === 'ephemeral') {
yield new ephemeral_github_runner_workflow_1.EphemeralGitHubRunnerWorkflow().run(new cloud_runner_step_state_1.CloudRunnerStepState(baseImage, cloud_runner_state_1.CloudRunnerState.readBuildEnvironmentVariables(), cloud_runner_state_1.CloudRunnerState.defaultSecrets));
yield new ephemeral_github_runner_workflow_1.EphemeralGitHubRunnerWorkflow().run(new cloud_runner_step_state_1.CloudRunnerStepState(baseImage, task_parameter_serializer_1.TaskParameterSerializer.readBuildEnvironmentVariables(), cloud_runner_state_1.CloudRunnerState.defaultSecrets));
}
else if (cloud_runner_state_1.CloudRunnerState.buildParams.customJob === 'download') {
yield new setup_step_1.SetupStep().run(new cloud_runner_step_state_1.CloudRunnerStepState('alpine/git', cloud_runner_state_1.CloudRunnerState.readBuildEnvironmentVariables(), cloud_runner_state_1.CloudRunnerState.defaultSecrets));
yield new setup_step_1.SetupStep().run(new cloud_runner_step_state_1.CloudRunnerStepState('alpine/git', task_parameter_serializer_1.TaskParameterSerializer.readBuildEnvironmentVariables(), cloud_runner_state_1.CloudRunnerState.defaultSecrets));
}
else {
yield custom_workflow_1.CustomWorkflow.runCustomJob(cloud_runner_state_1.CloudRunnerState.buildParams.customJob);

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

3
src/model/build-parameters.ts
View File

@ -1,6 +1,7 @@
import { customAlphabet } from 'nanoid';
import AndroidVersioning from './android-versioning';
import CloudRunnerConstants from './cloud-runner/services/cloud-runner-constants';
import CloudRunnerNamespace from './cloud-runner/services/cloud-runner-namespace';
import Input from './input';
import Platform from './platform';
import UnityVersioning from './unity-versioning';
@ -49,6 +50,7 @@ class BuildParameters {
public logToFile!: boolean;
public gitSha!: string;
public logId!: string;
public buildGuid!: string;
static async create(): Promise<BuildParameters> {
const buildFile = this.parseBuildFile(Input.buildName, Input.targetPlatform, Input.androidAppBundle);
@ -103,6 +105,7 @@ class BuildParameters {
awsStackName: Input.awsBaseStackName,
gitSha: Input.gitSha,
logId: customAlphabet(CloudRunnerConstants.alphabet, 9)(),
buildGuid: CloudRunnerNamespace.generateBuildName(Input.runNumber, Input.targetPlatform),
};
}

2
src/model/cloud-runner/aws/aws-task-runner.ts
View File

@ -182,7 +182,7 @@ class AWSTaskRunner {
}
message = `[${CloudRunnerStatics.logPrefix}] ${message}`;
if (CloudRunnerState.buildParams.logToFile) {
fs.appendFileSync(`${CloudRunnerState.buildGuid}-outputfile.txt`, `${message}\n`);
fs.appendFileSync(`${CloudRunnerState.buildParams.buildGuid}-outputfile.txt`, `${message}\n`);
}
CloudRunnerLogger.log(message);
}

2
src/model/cloud-runner/cloud-runner.test.ts
View File

@ -31,7 +31,7 @@ describe('Cloud Runner', () => {
buildParameter.logToFile = true;
const baseImage = new ImageTag(buildParameter);
await CloudRunner.run(buildParameter, baseImage.toString());
const testOutput = `${CloudRunnerState.buildGuid}-outputfile.txt`;
const testOutput = `${CloudRunnerState.buildParams.buildGuid}-outputfile.txt`;
expect(fs.existsSync(testOutput)).toBeTruthy();
const file = fs.readFileSync(testOutput, 'utf-8').toString();
expect(file).toContain(JSON.stringify(buildParameter));

7
src/model/cloud-runner/cloud-runner.ts
View File

@ -6,6 +6,7 @@ import CloudRunnerLogger from './services/cloud-runner-logger';
import { CloudRunnerStepState } from './state/cloud-runner-step-state';
import { WorkflowCompositionRoot } from './workflows/workflow-composition-root';
import { CloudRunnerError } from './error/cloud-runner-error';
import { TaskParameterSerializer } from './services/task-parameter-serializer';
class CloudRunner {
private static setup(buildParameters: BuildParameters) {
@ -32,7 +33,7 @@ class CloudRunner {
CloudRunner.setup(buildParameters);
try {
await CloudRunnerState.CloudRunnerProviderPlatform.setupSharedResources(
CloudRunnerState.buildGuid,
CloudRunnerState.buildParams.buildGuid,
CloudRunnerState.buildParams,
CloudRunnerState.branchName,
CloudRunnerState.defaultSecrets,
@ -40,12 +41,12 @@ class CloudRunner {
await new WorkflowCompositionRoot().run(
new CloudRunnerStepState(
baseImage,
CloudRunnerState.readBuildEnvironmentVariables(),
TaskParameterSerializer.readBuildEnvironmentVariables(),
CloudRunnerState.defaultSecrets,
),
);
await CloudRunnerState.CloudRunnerProviderPlatform.cleanupSharedResources(
CloudRunnerState.buildGuid,
CloudRunnerState.buildParams.buildGuid,
CloudRunnerState.buildParams,
CloudRunnerState.branchName,
CloudRunnerState.defaultSecrets,

2
src/model/cloud-runner/error/cloud-runner-error.ts
View File

@ -7,7 +7,7 @@ export class CloudRunnerError {
CloudRunnerLogger.error(JSON.stringify(error, undefined, 4));
core.setFailed('Cloud Runner failed');
await CloudRunnerState.CloudRunnerProviderPlatform.cleanupSharedResources(
CloudRunnerState.buildGuid,
CloudRunnerState.buildParams.buildGuid,
CloudRunnerState.buildParams,
CloudRunnerState.branchName,
CloudRunnerState.defaultSecrets,

2
src/model/cloud-runner/k8s/kubernetes-task-runner.ts
View File

@ -25,7 +25,7 @@ class KubernetesTaskRunner {
let message = chunk.toString();
message = `[${CloudRunnerStatics.logPrefix}] ${message}`;
if (CloudRunnerState.buildParams.logToFile) {
fs.appendFileSync(`${CloudRunnerState.buildGuid}-outputfile.txt`, `${message}\n`);
fs.appendFileSync(`${CloudRunnerState.buildParams.buildGuid}-outputfile.txt`, `${message}\n`);
}
logCallback(message);
next();

6
src/model/cloud-runner/services/task-parameter-serializer.ts
View File

@ -17,7 +17,7 @@ export class TaskParameterSerializer {
},
{
name: 'GITHUB_WORKSPACE',
value: `/${CloudRunnerState.buildVolumeFolder}/${CloudRunnerState.buildGuid}/${CloudRunnerState.repositoryFolder}/`,
value: `/${CloudRunnerState.buildVolumeFolder}/${CloudRunnerState.buildParams.buildGuid}/${CloudRunnerState.repositoryFolder}/`,
},
{
name: 'BUILD_TARGET',
@ -55,8 +55,8 @@ export class TaskParameterSerializer {
array.push(
{ name: 'buildParameters', value: JSON.stringify(CloudRunnerState.buildParams) },
{
name: Object.keys(CloudRunnerState.buildGuid)[0],
value: CloudRunnerState.buildGuid,
name: `buildGuid`,
value: CloudRunnerState.buildParams.buildGuid,
},
);
return array;

24
src/model/cloud-runner/state/cloud-runner-state.ts
View File

@ -1,26 +1,16 @@
import path from 'path';
import { BuildParameters } from '../..';
import CloudRunnerEnvironmentVariable from '../services/cloud-runner-environment-variable';
import CloudRunnerNamespace from '../services/cloud-runner-namespace';
import { CloudRunnerProviderInterface } from '../services/cloud-runner-provider-interface';
import CloudRunnerSecret from '../services/cloud-runner-secret';
import { TaskParameterSerializer } from '../services/task-parameter-serializer';
export class CloudRunnerState {
public static CloudRunnerProviderPlatform: CloudRunnerProviderInterface;
public static buildParams: BuildParameters;
public static defaultSecrets: CloudRunnerSecret[];
public static buildGuid: string;
public static readonly repositoryFolder = 'repo';
static setup(buildParameters: BuildParameters) {
CloudRunnerState.buildParams = buildParameters;
if (CloudRunnerState.buildGuid === undefined) {
CloudRunnerState.buildGuid = CloudRunnerNamespace.generateBuildName(
CloudRunnerState.runNumber,
buildParameters.platform,
);
}
}
public static get branchName(): string {
@ -28,7 +18,7 @@ export class CloudRunnerState {
}
public static get buildPathFull(): string {
return path.join(`/`, CloudRunnerState.buildVolumeFolder, CloudRunnerState.buildGuid);
return path.join(`/`, CloudRunnerState.buildVolumeFolder, CloudRunnerState.buildParams.buildGuid);
}
public static get builderPathFull(): string {
@ -90,16 +80,4 @@ export class CloudRunnerState {
public static get cacheFolder() {
return 'cache';
}
public static readBuildEnvironmentVariables(): CloudRunnerEnvironmentVariable[] {
return TaskParameterSerializer.readBuildEnvironmentVariables();
}
public static get runNumber() {
const runNumber = CloudRunnerState.buildParams.runNumber;
if (!runNumber || runNumber === '') {
throw new Error('no run number found, exiting');
}
return runNumber;
}
}

10
src/model/cloud-runner/steps/build-step.ts
View File

@ -21,7 +21,7 @@ export class BuildStep implements StepInterface {
) {
CloudRunnerLogger.logLine('Starting part 2/2 (build unity project)');
await CloudRunnerState.CloudRunnerProviderPlatform.runTask(
CloudRunnerState.buildGuid,
CloudRunnerState.buildParams.buildGuid,
image,
`
export GITHUB_WORKSPACE="${CloudRunnerState.repoPathFull}"
@ -34,13 +34,13 @@ export class BuildStep implements StepInterface {
apt-get update
apt-get install -y -q zip
cd "${CloudRunnerState.libraryFolderFull}/.."
zip -r "lib-$buildGuid.zip" "./Library"
mv "lib-$buildGuid.zip" "${CloudRunnerState.cacheFolderFull}/lib"
zip -r "lib-$BUILD_GUID.zip" "./Library"
mv "lib-$BUILD_GUID.zip" "${CloudRunnerState.cacheFolderFull}/lib"
ls -lh "${CloudRunnerState.cacheFolderFull}/lib"
cd "${CloudRunnerState.repoPathFull}"
ls -lh "${CloudRunnerState.repoPathFull}"
zip -r "build-$buildGuid.zip" "./${CloudRunnerState.buildParams.buildPath}"
mv "build-$buildGuid.zip" "${CloudRunnerState.cacheFolderFull}/build-$buildGuid.zip"
zip -r "build-$BUILD_GUID.zip" "./${CloudRunnerState.buildParams.buildPath}"
mv "build-$BUILD_GUID.zip" "${CloudRunnerState.cacheFolderFull}/build-$BUILD_GUID.zip"
ls ${CloudRunnerState.cacheFolderFull}/lib
echo " "
ls

2
src/model/cloud-runner/steps/setup-step.ts
View File

@ -26,7 +26,7 @@ export class SetupStep implements StepInterface {
try {
CloudRunnerLogger.logLine('Starting step 1/2 download game files from repository, try to use cache');
await CloudRunnerState.CloudRunnerProviderPlatform.runTask(
CloudRunnerState.buildGuid,
CloudRunnerState.buildParams.buildGuid,
image,
`
apk update -q

5
src/model/cloud-runner/workflows/build-automation-workflow.ts
View File

@ -1,4 +1,5 @@
import CloudRunnerLogger from '../services/cloud-runner-logger';
import { TaskParameterSerializer } from '../services/task-parameter-serializer';
import { CloudRunnerState } from '../state/cloud-runner-state';
import { CloudRunnerStepState } from '../state/cloud-runner-step-state';
import { BuildStep } from '../steps/build-step';
@ -22,7 +23,7 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
await new SetupStep().run(
new CloudRunnerStepState(
'alpine/git',
CloudRunnerState.readBuildEnvironmentVariables(),
TaskParameterSerializer.readBuildEnvironmentVariables(),
CloudRunnerState.defaultSecrets,
),
);
@ -35,7 +36,7 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
await new BuildStep().run(
new CloudRunnerStepState(
baseImage,
CloudRunnerState.readBuildEnvironmentVariables(),
TaskParameterSerializer.readBuildEnvironmentVariables(),
CloudRunnerState.defaultSecrets,
),
);

5
src/model/cloud-runner/workflows/custom-workflow.ts
View File

@ -3,6 +3,7 @@ import CloudRunnerSecret from '../services/cloud-runner-secret';
import { CloudRunnerState } from '../state/cloud-runner-state';
import YAML from 'yaml';
import { Input } from '../..';
import { TaskParameterSerializer } from '../services/task-parameter-serializer';
export class CustomWorkflow {
public static async runCustomJob(buildSteps) {
@ -20,12 +21,12 @@ export class CustomWorkflow {
return secret;
});
await CloudRunnerState.CloudRunnerProviderPlatform.runTask(
CloudRunnerState.buildGuid,
CloudRunnerState.buildParams.buildGuid,
step['image'],
step['commands'],
`/${CloudRunnerState.buildVolumeFolder}`,
`/${CloudRunnerState.buildVolumeFolder}`,
CloudRunnerState.readBuildEnvironmentVariables(),
TaskParameterSerializer.readBuildEnvironmentVariables(),
[...CloudRunnerState.defaultSecrets, ...stepSecrets],
);
}

2
src/model/cloud-runner/workflows/ephemeral-github-runner-workflow.ts
View File

@ -28,7 +28,7 @@ export class EphemeralGitHubRunnerWorkflow implements WorkflowInterface {
const installAndStartRunner =
' cd ../.. && ls && mkdir actions-runner && cd actions-runner && curl -O -L https://github.com/actions/runner/releases/download/v2.283.1/actions-runner-linux-x64-2.283.1.tar.gz && tar xzf ./actions-runner-linux-x64-2.283.1.tar.gz';
await CloudRunnerState.CloudRunnerProviderPlatform.runTask(
CloudRunnerState.buildGuid,
CloudRunnerState.buildParams.buildGuid,
image,
installAndStartRunner,
`/runner`,

7
src/model/cloud-runner/workflows/workflow-composition-root.ts
View File

@ -6,6 +6,7 @@ import { EphemeralGitHubRunnerWorkflow } from './ephemeral-github-runner-workflo
import { WorkflowInterface } from './workflow-interface';
import { BuildAutomationWorkflow } from './build-automation-workflow';
import CloudRunnerLogger from '../services/cloud-runner-logger';
import { TaskParameterSerializer } from '../services/task-parameter-serializer';
export class WorkflowCompositionRoot implements WorkflowInterface {
async run(cloudRunnerStepState: CloudRunnerStepState) {
@ -23,7 +24,7 @@ export class WorkflowCompositionRoot implements WorkflowInterface {
await new BuildAutomationWorkflow().run(
new CloudRunnerStepState(
baseImage,
CloudRunnerState.readBuildEnvironmentVariables(),
TaskParameterSerializer.readBuildEnvironmentVariables(),
CloudRunnerState.defaultSecrets,
),
);
@ -31,7 +32,7 @@ export class WorkflowCompositionRoot implements WorkflowInterface {
await new EphemeralGitHubRunnerWorkflow().run(
new CloudRunnerStepState(
baseImage,
CloudRunnerState.readBuildEnvironmentVariables(),
TaskParameterSerializer.readBuildEnvironmentVariables(),
CloudRunnerState.defaultSecrets,
),
);
@ -39,7 +40,7 @@ export class WorkflowCompositionRoot implements WorkflowInterface {
await new SetupStep().run(
new CloudRunnerStepState(
'alpine/git',
CloudRunnerState.readBuildEnvironmentVariables(),
TaskParameterSerializer.readBuildEnvironmentVariables(),
CloudRunnerState.defaultSecrets,
),
);