Add nodejs as build step dependency

pull/353/head
Frostebite 2022-03-16 21:52:25 +00:00
parent c269d49b4e
commit c5d2d8d27b
5 changed files with 29 additions and 13 deletions

View File

@ -155,7 +155,7 @@ inputs:
required: false required: false
description: 'Amount of disc space to assign the Kubernetes Persistent Volume' description: 'Amount of disc space to assign the Kubernetes Persistent Volume'
cacheKey: cacheKey:
default: 'branch' default: ''
required: false required: false
description: 'Cache key to indicate bucket for cache' description: 'Cache key to indicate bucket for cache'
checkDependencyHealthOverride: checkDependencyHealthOverride:

15
dist/index.js vendored
View File

@ -3130,7 +3130,7 @@ class BuildStep {
chmod -R +x "/steps" chmod -R +x "/steps"
/entrypoint.sh /entrypoint.sh
apt-get update apt-get update
apt-get install -y -q zip tree apt-get install -y -q zip tree nodejs
cd "${cloud_runner_state_1.CloudRunnerState.libraryFolderFull.replace(/\\/g, `/`)}/.." cd "${cloud_runner_state_1.CloudRunnerState.libraryFolderFull.replace(/\\/g, `/`)}/.."
zip -r "lib-${cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid}.zip" "Library" zip -r "lib-${cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid}.zip" "Library"
mv "lib-${cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid}.zip" "${cloud_runner_state_1.CloudRunnerState.cacheFolderFull.replace(/\\/g, `/`)}/Library" mv "lib-${cloud_runner_state_1.CloudRunnerState.buildParams.buildGuid}.zip" "${cloud_runner_state_1.CloudRunnerState.cacheFolderFull.replace(/\\/g, `/`)}/Library"
@ -4039,7 +4039,9 @@ class Input {
static shouldUseOverride(query) { static shouldUseOverride(query) {
if (Input.readInputOverrideCommand() !== '') { if (Input.readInputOverrideCommand() !== '') {
if (Input.readInputFromOverrideList() !== '') { if (Input.readInputFromOverrideList() !== '') {
return Input.readInputFromOverrideList().split(',').includes(query) ? true : false; const doesInclude = Input.readInputFromOverrideList().split(',').includes(query) ||
Input.readInputFromOverrideList().split(',').includes(Input.ToEnvVarFormat(query));
return doesInclude ? true : false;
} }
else { else {
return true; return true;
@ -4060,7 +4062,7 @@ class Input {
Input.queryOverrides = new Array(); Input.queryOverrides = new Array();
for (const element of queries) { for (const element of queries) {
if (Input.shouldUseOverride(element)) { if (Input.shouldUseOverride(element)) {
Input.queryOverrides.push(yield Input.queryOverride(element)); Input.queryOverrides[element] = yield Input.queryOverride(element);
} }
} }
}); });
@ -4073,9 +4075,14 @@ class Input {
if (Input.cliOptions !== undefined && Input.cliOptions[query] !== undefined) { if (Input.cliOptions !== undefined && Input.cliOptions[query] !== undefined) {
return Input.cliOptions[query]; return Input.cliOptions[query];
} }
if (Input.queryOverrides !== undefined && Input.queryOverrides[query] !== undefined) { if (Input.queryOverrides !== undefined) {
if (Input.queryOverrides[query] !== null) {
return Input.queryOverrides[query]; return Input.queryOverrides[query];
} }
if (Input.queryOverrides[Input.ToEnvVarFormat(query)] !== null) {
return Input.queryOverrides[Input.ToEnvVarFormat(query)];
}
}
if (process.env[query] !== undefined) { if (process.env[query] !== undefined) {
return process.env[query]; return process.env[query];
} }

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -45,7 +45,7 @@ export class BuildStep implements StepInterface {
chmod -R +x "/steps" chmod -R +x "/steps"
/entrypoint.sh /entrypoint.sh
apt-get update apt-get update
apt-get install -y -q zip tree apt-get install -y -q zip tree nodejs
cd "${CloudRunnerState.libraryFolderFull.replace(/\\/g, `/`)}/.." cd "${CloudRunnerState.libraryFolderFull.replace(/\\/g, `/`)}/.."
zip -r "lib-${CloudRunnerState.buildParams.buildGuid}.zip" "Library" zip -r "lib-${CloudRunnerState.buildParams.buildGuid}.zip" "Library"
mv "lib-${CloudRunnerState.buildParams.buildGuid}.zip" "${CloudRunnerState.cacheFolderFull.replace( mv "lib-${CloudRunnerState.buildParams.buildGuid}.zip" "${CloudRunnerState.cacheFolderFull.replace(

View File

@ -32,7 +32,10 @@ class Input {
private static shouldUseOverride(query) { private static shouldUseOverride(query) {
if (Input.readInputOverrideCommand() !== '') { if (Input.readInputOverrideCommand() !== '') {
if (Input.readInputFromOverrideList() !== '') { if (Input.readInputFromOverrideList() !== '') {
return Input.readInputFromOverrideList().split(',').includes(query) ? true : false; const doesInclude =
Input.readInputFromOverrideList().split(',').includes(query) ||
Input.readInputFromOverrideList().split(',').includes(Input.ToEnvVarFormat(query));
return doesInclude ? true : false;
} else { } else {
return true; return true;
} }
@ -52,12 +55,12 @@ class Input {
Input.queryOverrides = new Array(); Input.queryOverrides = new Array();
for (const element of queries) { for (const element of queries) {
if (Input.shouldUseOverride(element)) { if (Input.shouldUseOverride(element)) {
Input.queryOverrides.push(await Input.queryOverride(element)); Input.queryOverrides[element] = await Input.queryOverride(element);
} }
} }
} }
private static getInput(query) { public static getInput(query) {
const coreInput = core.getInput(query); const coreInput = core.getInput(query);
if (Input.githubInputEnabled && coreInput && coreInput !== '') { if (Input.githubInputEnabled && coreInput && coreInput !== '') {
return coreInput; return coreInput;
@ -67,10 +70,16 @@ class Input {
return Input.cliOptions[query]; return Input.cliOptions[query];
} }
if (Input.queryOverrides !== undefined && Input.queryOverrides[query] !== undefined) { if (Input.queryOverrides !== undefined) {
if (Input.queryOverrides[query] !== null) {
return Input.queryOverrides[query]; return Input.queryOverrides[query];
} }
if (Input.queryOverrides[Input.ToEnvVarFormat(query)] !== null) {
return Input.queryOverrides[Input.ToEnvVarFormat(query)];
}
}
if (process.env[query] !== undefined) { if (process.env[query] !== undefined) {
return process.env[query]; return process.env[query];
} }