Fixing cloud runner always running
parent
6562431335
commit
3ad76f7e5a
|
|
@ -55,13 +55,12 @@ function runMain() {
|
|||
const { dockerfile, workspace, actionFolder } = model_1.Action;
|
||||
const buildParameters = yield model_1.BuildParameters.create();
|
||||
const baseImage = new model_1.ImageTag(buildParameters);
|
||||
let builtImage;
|
||||
if (buildParameters.cloudRunnerCluster !== '') {
|
||||
if (buildParameters.cloudRunnerCluster !== '' && buildParameters.cloudRunnerCluster !== undefined) {
|
||||
yield model_1.CloudRunner.run(buildParameters, baseImage.toString());
|
||||
}
|
||||
else {
|
||||
core.info('Building locally');
|
||||
builtImage = yield model_1.Docker.build({ path: actionFolder, dockerfile, baseImage });
|
||||
const builtImage = yield model_1.Docker.build({ path: actionFolder, dockerfile, baseImage });
|
||||
yield model_1.Docker.run(builtImage, Object.assign({ workspace }, buildParameters));
|
||||
}
|
||||
// Set output
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -10,13 +10,12 @@ async function runMain() {
|
|||
|
||||
const buildParameters = await BuildParameters.create();
|
||||
const baseImage = new ImageTag(buildParameters);
|
||||
let builtImage;
|
||||
|
||||
if (buildParameters.cloudRunnerCluster !== '') {
|
||||
if (buildParameters.cloudRunnerCluster !== '' && buildParameters.cloudRunnerCluster !== undefined) {
|
||||
await CloudRunner.run(buildParameters, baseImage.toString());
|
||||
} else {
|
||||
core.info('Building locally');
|
||||
builtImage = await Docker.build({ path: actionFolder, dockerfile, baseImage });
|
||||
const builtImage = await Docker.build({ path: actionFolder, dockerfile, baseImage });
|
||||
await Docker.run(builtImage, { workspace, ...buildParameters });
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue