better named tests and log local-docker params

pull/461/head
Frostebite 2022-09-20 22:53:00 +01:00
parent 0cc6270b68
commit 9680daecd9
3 changed files with 39 additions and 23 deletions

22
dist/index.js vendored
View File

@ -3606,21 +3606,23 @@ class LocalDockerCloudRunner {
branchName, branchName,
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
defaultSecretsArray) { } defaultSecretsArray) { }
runTask(buildGuid, image, commands, runTask(buildGuid, image, commands, mountdir, workingdir, environment, secrets) {
// eslint-disable-next-line no-unused-vars
mountdir,
// eslint-disable-next-line no-unused-vars
workingdir,
// eslint-disable-next-line no-unused-vars
environment,
// eslint-disable-next-line no-unused-vars
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);
cloud_runner_logger_1.default.log(commands); cloud_runner_logger_1.default.log(commands);
const { workspace, actionFolder } = model_1.Action; const { workspace, actionFolder } = model_1.Action;
let myOutput = ''; let myOutput = '';
yield docker_1.default.run(image, Object.assign({ workspace, actionFolder }, model_1.CloudRunner.buildParameters), false, commands, { const content = [
...secrets.map((x) => {
secrets[x.EnvironmentVariable] = x.ParameterValue;
return;
}),
...environment.map((x) => {
environment[x.name] = x.value;
return;
}),
];
yield docker_1.default.run(image, Object.assign(Object.assign({ workspace, actionFolder, mountdir, workingdir }, model_1.CloudRunner.buildParameters), content), false, commands, {
listeners: { listeners: {
stdout: (data) => { stdout: (data) => {
myOutput += data.toString(); myOutput += data.toString();

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -48,13 +48,9 @@ class LocalDockerCloudRunner implements ProviderInterface {
buildGuid: string, buildGuid: string,
image: string, image: string,
commands: string, commands: string,
// eslint-disable-next-line no-unused-vars
mountdir: string, mountdir: string,
// eslint-disable-next-line no-unused-vars
workingdir: string, workingdir: string,
// eslint-disable-next-line no-unused-vars
environment: CloudRunnerEnvironmentVariable[], environment: CloudRunnerEnvironmentVariable[],
// eslint-disable-next-line no-unused-vars
secrets: CloudRunnerSecret[], secrets: CloudRunnerSecret[],
): Promise<string> { ): Promise<string> {
CloudRunnerLogger.log(buildGuid); CloudRunnerLogger.log(buildGuid);
@ -62,7 +58,24 @@ class LocalDockerCloudRunner implements ProviderInterface {
const { workspace, actionFolder } = Action; const { workspace, actionFolder } = Action;
let myOutput = ''; let myOutput = '';
await Docker.run(image, { workspace, actionFolder, ...CloudRunner.buildParameters }, false, commands, { const content = [
...secrets.map((x) => {
secrets[x.EnvironmentVariable] = x.ParameterValue;
return;
}),
...environment.map((x) => {
environment[x.name] = x.value;
return;
}),
];
await Docker.run(
image,
{ workspace, actionFolder, mountdir, workingdir, ...CloudRunner.buildParameters, ...content },
false,
commands,
{
listeners: { listeners: {
stdout: (data: Buffer) => { stdout: (data: Buffer) => {
myOutput += data.toString(); myOutput += data.toString();
@ -71,7 +84,8 @@ class LocalDockerCloudRunner implements ProviderInterface {
myOutput += `[ERROR]${data.toString()}`; myOutput += `[ERROR]${data.toString()}`;
}, },
}, },
}); },
);
return myOutput; return myOutput;
} }