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

better named tests and log local-docker params

pull/461/head
Frostebite 2022-09-20 23:14:08 +01:00
parent 3861aac122
commit 16c6f661ee
3 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/index.js vendored
View File

@ -3597,15 +3597,13 @@ class LocalDockerCloudRunner {
branchName, branchName,
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
defaultSecretsArray) { } defaultSecretsArray) { }
setup( setup(buildGuid, buildParameters,
// eslint-disable-next-line no-unused-vars
buildGuid,
// eslint-disable-next-line no-unused-vars
buildParameters,
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
branchName, branchName,
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
defaultSecretsArray) { } defaultSecretsArray) {
this.buildParameters = buildParameters;
}
runTask(buildGuid, image, commands, mountdir, workingdir, environment, secrets) { runTask(buildGuid, image, commands, mountdir, workingdir, environment, secrets) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
cloud_runner_logger_1.default.log(buildGuid); cloud_runner_logger_1.default.log(buildGuid);
@ -3622,7 +3620,7 @@ class LocalDockerCloudRunner {
return; return;
}), }),
]; ];
yield docker_1.default.run(image, Object.assign(Object.assign({ workspace, actionFolder, mountdir, workingdir }, model_1.CloudRunner.buildParameters), content), false, commands, { yield docker_1.default.run(image, Object.assign(Object.assign({ workspace, actionFolder }, this.buildParameters), content), false, commands, {
listeners: { listeners: {
stdout: (data) => { stdout: (data) => {
myOutput += data.toString(); myOutput += data.toString();

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

21
src/model/cloud-runner/providers/local-docker/index.ts
View File

@ -4,9 +4,11 @@ import CloudRunnerLogger from '../../services/cloud-runner-logger';
import { ProviderInterface } from '../provider-interface'; import { ProviderInterface } from '../provider-interface';
import CloudRunnerSecret from '../../services/cloud-runner-secret'; import CloudRunnerSecret from '../../services/cloud-runner-secret';
import Docker from '../../../docker'; import Docker from '../../../docker';
import { Action, CloudRunner } from '../../../../model'; import { Action } from '../../../../model';
class LocalDockerCloudRunner implements ProviderInterface { class LocalDockerCloudRunner implements ProviderInterface {
public buildParameters: BuildParameters | undefined;
inspect(): Promise<string> { inspect(): Promise<string> {
throw new Error('Method not implemented.'); throw new Error('Method not implemented.');
} }
@ -35,15 +37,16 @@ class LocalDockerCloudRunner implements ProviderInterface {
defaultSecretsArray: { ParameterKey: string; EnvironmentVariable: string; ParameterValue: string }[], defaultSecretsArray: { ParameterKey: string; EnvironmentVariable: string; ParameterValue: string }[],
) {} ) {}
setup( setup(
// eslint-disable-next-line no-unused-vars
buildGuid: string, buildGuid: string,
// eslint-disable-next-line no-unused-vars
buildParameters: BuildParameters, buildParameters: BuildParameters,
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
branchName: string, branchName: string,
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
defaultSecretsArray: { ParameterKey: string; EnvironmentVariable: string; ParameterValue: string }[], defaultSecretsArray: { ParameterKey: string; EnvironmentVariable: string; ParameterValue: string }[],
) {} ) {
this.buildParameters = buildParameters;
}
public async runTask( public async runTask(
buildGuid: string, buildGuid: string,
image: string, image: string,
@ -70,12 +73,7 @@ class LocalDockerCloudRunner implements ProviderInterface {
return; return;
}), }),
]; ];
await Docker.run( await Docker.run(image, { workspace, actionFolder, ...this.buildParameters, ...content }, false, commands, {
image,
{ workspace, actionFolder, mountdir, workingdir, ...CloudRunner.buildParameters, ...content },
false,
commands,
{
listeners: { listeners: {
stdout: (data: Buffer) => { stdout: (data: Buffer) => {
myOutput += data.toString(); myOutput += data.toString();
@ -84,8 +82,7 @@ class LocalDockerCloudRunner implements ProviderInterface {
myOutput += `[ERROR]${data.toString()}`; myOutput += `[ERROR]${data.toString()}`;
}, },
}, },
}, });
);
return myOutput; return myOutput;
} }