Various fixes
parent
0bf23325a5
commit
f0532ed5e9
|
|
@ -429,7 +429,7 @@ exports.CliFunction = CliFunction;
|
|||
function GetCliFunctions(key) {
|
||||
const results = targets.find((x) => x.key === key);
|
||||
if (results === undefined || results.length === 0) {
|
||||
throw new Error('no CLI mode found');
|
||||
throw new Error(`no CLI mode found for ${key}`);
|
||||
}
|
||||
return results;
|
||||
}
|
||||
|
|
@ -3087,16 +3087,6 @@ class BuildAutomationWorkflow {
|
|||
if (!cloud_runner_1.default.buildParameters.cliMode)
|
||||
core.endGroup();
|
||||
cloud_runner_logger_1.default.logWithTime('Configurable pre build step(s) time');
|
||||
// core.startGroup('setup');
|
||||
// output += await new SetupStep().run(
|
||||
// new CloudRunnerStepState(
|
||||
// 'alpine/git',
|
||||
// TaskParameterSerializer.readBuildEnvironmentVariables(),
|
||||
// CloudRunnerState.defaultSecrets,
|
||||
// ),
|
||||
// );
|
||||
// core.endGroup();
|
||||
// CloudRunnerLogger.logWithTime('Download repository step time');
|
||||
if (!cloud_runner_1.default.buildParameters.cliMode)
|
||||
core.startGroup('build');
|
||||
cloud_runner_logger_1.default.log(baseImage.toString());
|
||||
|
|
@ -3129,7 +3119,6 @@ class BuildAutomationWorkflow {
|
|||
apt-get install -q -y zip tree npm git-lfs jq unzip git
|
||||
npm install -g n
|
||||
n stable
|
||||
cd ${cloud_runner_folders_1.CloudRunnerFolders.repoPathFull.replace(/\\/g, `/`)}
|
||||
${setupHooks.filter((x) => x.hook.includes(`before`)).map((x) => x.commands) || ' '}
|
||||
export GITHUB_WORKSPACE="${cloud_runner_folders_1.CloudRunnerFolders.repoPathFull.replace(/\\/g, `/`)}"
|
||||
${BuildAutomationWorkflow.SetupCommands}
|
||||
|
|
@ -3171,9 +3160,9 @@ class BuildAutomationWorkflow {
|
|||
zip -r "build-${cloud_runner_1.default.buildParameters.buildGuid}.zip" "build"
|
||||
mv "build-${cloud_runner_1.default.buildParameters.buildGuid}.zip" "${cloud_runner_folders_1.CloudRunnerFolders.cacheFolderFull.replace(/\\/g, `/`)}"
|
||||
chmod +x ${path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathFull, 'dist', `index.js`).replace(/\\/g, `/`)}
|
||||
node ${path_1.default
|
||||
node "${path_1.default
|
||||
.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathFull, 'dist', `index.js`)
|
||||
.replace(/\\/g, `/`)} -m cache-push "Library" "lib-${cloud_runner_1.default.buildParameters.buildGuid}.zip" "${cloud_runner_folders_1.CloudRunnerFolders.cacheFolderFull.replace(/\\/g, `/`)}/Library"
|
||||
.replace(/\\/g, `/`)}" -m cache-push "Library" "lib-${cloud_runner_1.default.buildParameters.buildGuid}.zip" "${cloud_runner_folders_1.CloudRunnerFolders.cacheFolderFull.replace(/\\/g, `/`)}/Library"
|
||||
${cloud_runner_1.default.buildParameters.cloudRunnerIntegrationTests ? '' : '#'} tree -lh "${cloud_runner_folders_1.CloudRunnerFolders.cacheFolderFull}"`;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -13,7 +13,7 @@ export function CliFunction(key: string, description: string) {
|
|||
export function GetCliFunctions(key) {
|
||||
const results = targets.find((x) => x.key === key);
|
||||
if (results === undefined || results.length === 0) {
|
||||
throw new Error('no CLI mode found');
|
||||
throw new Error(`no CLI mode found for ${key}`);
|
||||
}
|
||||
return results;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,17 +29,6 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
|
|||
if (!CloudRunner.buildParameters.cliMode) core.endGroup();
|
||||
CloudRunnerLogger.logWithTime('Configurable pre build step(s) time');
|
||||
|
||||
// core.startGroup('setup');
|
||||
// output += await new SetupStep().run(
|
||||
// new CloudRunnerStepState(
|
||||
// 'alpine/git',
|
||||
// TaskParameterSerializer.readBuildEnvironmentVariables(),
|
||||
// CloudRunnerState.defaultSecrets,
|
||||
// ),
|
||||
// );
|
||||
// core.endGroup();
|
||||
// CloudRunnerLogger.logWithTime('Download repository step time');
|
||||
|
||||
if (!CloudRunner.buildParameters.cliMode) core.startGroup('build');
|
||||
CloudRunnerLogger.log(baseImage.toString());
|
||||
CloudRunnerLogger.logLine(` `);
|
||||
|
|
@ -83,7 +72,6 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
|
|||
apt-get install -q -y zip tree npm git-lfs jq unzip git
|
||||
npm install -g n
|
||||
n stable
|
||||
cd ${CloudRunnerFolders.repoPathFull.replace(/\\/g, `/`)}
|
||||
${setupHooks.filter((x) => x.hook.includes(`before`)).map((x) => x.commands) || ' '}
|
||||
export GITHUB_WORKSPACE="${CloudRunnerFolders.repoPathFull.replace(/\\/g, `/`)}"
|
||||
${BuildAutomationWorkflow.SetupCommands}
|
||||
|
|
@ -134,9 +122,9 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
|
|||
zip -r "build-${CloudRunner.buildParameters.buildGuid}.zip" "build"
|
||||
mv "build-${CloudRunner.buildParameters.buildGuid}.zip" "${CloudRunnerFolders.cacheFolderFull.replace(/\\/g, `/`)}"
|
||||
chmod +x ${path.join(CloudRunnerFolders.builderPathFull, 'dist', `index.js`).replace(/\\/g, `/`)}
|
||||
node ${path
|
||||
node "${path
|
||||
.join(CloudRunnerFolders.builderPathFull, 'dist', `index.js`)
|
||||
.replace(/\\/g, `/`)} -m cache-push "Library" "lib-${
|
||||
.replace(/\\/g, `/`)}" -m cache-push "Library" "lib-${
|
||||
CloudRunner.buildParameters.buildGuid
|
||||
}.zip" "${CloudRunnerFolders.cacheFolderFull.replace(/\\/g, `/`)}/Library"
|
||||
${CloudRunner.buildParameters.cloudRunnerIntegrationTests ? '' : '#'} tree -lh "${
|
||||
|
|
|
|||
Loading…
Reference in New Issue