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

Fixing cloud runner always running

pull/310/head
Frostebite 2021-12-29 16:18:36 +00:00
parent 6562431335
commit 3ad76f7e5a
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/index.js vendored
View File

@ -55,13 +55,12 @@ 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 !== '' && buildParameters.cloudRunnerCluster !== undefined) {
if (buildParameters.cloudRunnerCluster !== '') {
yield model_1.CloudRunner.run(buildParameters, baseImage.toString()); yield model_1.CloudRunner.run(buildParameters, baseImage.toString());
} }
else { else {
core.info('Building locally'); 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)); yield model_1.Docker.run(builtImage, Object.assign({ workspace }, buildParameters));
} }
// Set output // Set output

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

5
src/index.ts
View File

@ -10,13 +10,12 @@ async function runMain() {
const buildParameters = await BuildParameters.create(); const buildParameters = await BuildParameters.create();
const baseImage = new ImageTag(buildParameters); const baseImage = new ImageTag(buildParameters);
let builtImage;
if (buildParameters.cloudRunnerCluster !== '') { if (buildParameters.cloudRunnerCluster !== '' && buildParameters.cloudRunnerCluster !== undefined) {
await CloudRunner.run(buildParameters, baseImage.toString()); await CloudRunner.run(buildParameters, baseImage.toString());
} else { } else {
core.info('Building locally'); 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 }); await Docker.run(builtImage, { workspace, ...buildParameters });
} }