linting
parent
599de3b551
commit
6287aa0973
|
|
@ -51,7 +51,6 @@ function runMain() {
|
||||||
const { dockerfile, workspace, actionFolder } = model_1.Action;
|
const { dockerfile, workspace, actionFolder } = model_1.Action;
|
||||||
const buildParameters = yield model_1.BuildParameters.create();
|
const buildParameters = yield model_1.BuildParameters.create();
|
||||||
const baseImage = new model_1.ImageTag(buildParameters);
|
const baseImage = new model_1.ImageTag(buildParameters);
|
||||||
let builtImage;
|
|
||||||
if (buildParameters.cloudRunnerCluster &&
|
if (buildParameters.cloudRunnerCluster &&
|
||||||
buildParameters.cloudRunnerCluster !== '' &&
|
buildParameters.cloudRunnerCluster !== '' &&
|
||||||
buildParameters.cloudRunnerCluster !== 'local') {
|
buildParameters.cloudRunnerCluster !== 'local') {
|
||||||
|
|
@ -64,7 +63,6 @@ function runMain() {
|
||||||
mac_builder_1.default.run(actionFolder, workspace, buildParameters);
|
mac_builder_1.default.run(actionFolder, workspace, buildParameters);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
//builtImage = await Docker.build({ path: actionFolder, dockerfile, baseImage });
|
|
||||||
yield model_1.Docker.run(baseImage, Object.assign({ workspace, actionFolder }, buildParameters));
|
yield model_1.Docker.run(baseImage, Object.assign({ workspace, actionFolder }, buildParameters));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -43,7 +43,14 @@ class Docker {
|
||||||
await exec(runCommand, undefined, { silent });
|
await exec(runCommand, undefined, { silent });
|
||||||
}
|
}
|
||||||
|
|
||||||
static getBaseOsSpecificArguments(baseOs, workspace, actionFolder, unitySerial, runnerTemporaryPath, sshAgent): string {
|
static getBaseOsSpecificArguments(
|
||||||
|
baseOs,
|
||||||
|
workspace,
|
||||||
|
actionFolder,
|
||||||
|
unitySerial,
|
||||||
|
runnerTemporaryPath,
|
||||||
|
sshAgent,
|
||||||
|
): string {
|
||||||
switch (baseOs) {
|
switch (baseOs) {
|
||||||
case 'linux': {
|
case 'linux': {
|
||||||
const githubHome = path.join(runnerTemporaryPath, '_github_home');
|
const githubHome = path.join(runnerTemporaryPath, '_github_home');
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue