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

get output from local-docker

pull/461/head
Frostebite 2022-09-19 02:12:28 +01:00
parent 9e5ebff23a
commit 1771726c36
3 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/index.js vendored
View File

@ -3607,21 +3607,13 @@ class LocalDockerCloudRunner {
branchName,
// eslint-disable-next-line no-unused-vars
defaultSecretsArray) { }
runTask(buildGuid, image, commands,
// 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) {
runTask(buildGuid, image, commands, mountdir, workingdir, environment, secrets) {
return __awaiter(this, void 0, void 0, function* () {
cloud_runner_logger_1.default.log(buildGuid);
cloud_runner_logger_1.default.log(commands);
const { workspace, actionFolder } = model_1.Action;
let myOutput = '';
yield docker_1.default.run(image, Object.assign({ workspace, actionFolder }, cloud_runner_1.default.buildParameters), false, commands, {
yield docker_1.default.run(image, Object.assign(Object.assign(Object.assign({ workspace, actionFolder }, cloud_runner_1.default.buildParameters), secrets), environment), false, commands, {
listeners: {
stdout: (data) => {
myOutput += data.toString();

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

@ -49,13 +49,9 @@ class LocalDockerCloudRunner implements ProviderInterface {
buildGuid: string,
image: string,
commands: string,
// eslint-disable-next-line no-unused-vars
mountdir: string,
// eslint-disable-next-line no-unused-vars
workingdir: string,
// eslint-disable-next-line no-unused-vars
environment: CloudRunnerEnvironmentVariable[],
// eslint-disable-next-line no-unused-vars
secrets: CloudRunnerSecret[],
): Promise<string> {
CloudRunnerLogger.log(buildGuid);
@ -63,7 +59,12 @@ class LocalDockerCloudRunner implements ProviderInterface {
const { workspace, actionFolder } = Action;
let myOutput = '';
await Docker.run(image, { workspace, actionFolder, ...CloudRunner.buildParameters }, false, commands, {
await Docker.run(
image,
{ workspace, actionFolder, ...CloudRunner.buildParameters, ...secrets, ...environment },
false,
commands,
{
listeners: {
stdout: (data: Buffer) => {
myOutput += data.toString();
@ -72,7 +73,8 @@ class LocalDockerCloudRunner implements ProviderInterface {
myOutput += `[ERROR]${data.toString()}`;
},
},
});
},
);
return myOutput;
}