@catladder/pipeline 1.153.0 → 1.154.0

package/dist/build/node/testJob.js

@@ -46,11 +46,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createNodeTestJobs = void 0;
 var runner_1 = require("../../runner");
+var context_1 = require("../../types/context");
 var utils_1 = require("../../utils");
+var createArtifactsConfig_1 = require("../base/createArtifactsConfig");
 var cache_1 = require("./cache");
 var constants_1 = require("./constants");
 var yarn_1 = require("./yarn");
-var createArtifactsConfig_1 = require("../base/createArtifactsConfig");
 var createNodeTestJobs = function (context) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
   // don't run tests after release
@@ -58,17 +59,21 @@ var createNodeTestJobs = function (context) {
   if (context.trigger === "taggedRelease") {
     return [];
   }
-  var buildConfig = context.build.config;
+  // if its not a standalone build, we don't need to run tests
+  if (context.type === "component" && !(0, context_1.componentContextIsStandaloneBuild)(context)) {
+    return [];
+  }
   var defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
   var base = {
-    variables: __assign(__assign({
+    variables: __assign({
       APP_PATH: context.build.dir
-    }, context.environment.jobOnlyVars.build.envVars), (_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {}),
+    }, context.type === "component" ? __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), (_a = context.build.config.extraVars) !== null && _a !== void 0 ? _a : {}) : {}),
     runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
     stage: "test",
     needs: [],
     envMode: "none"
   };
+  var buildConfig = context.build.config;
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
   var auditJob = buildConfig.audit !== false ? __assign(__assign(__assign({
     name: "🛡 audit"

package/dist/build/node/yarn.js

@@ -53,7 +53,7 @@ var ensureNodeVersion = function (context) {
 exports.ensureNodeVersion = ensureNodeVersion;
 var getYarnInstall = function (context, options) {
   var _a;
-  var postInstall = "postInstall" in context.build.config ? context.build.config.postInstall : null;
+  var postInstall = context.type !== "workspace" && "postInstall" in context.build.config ? context.build.config.postInstall : null;
   return __spreadArray(__spreadArray(__spreadArray([], __read((0, exports.ensureNodeVersion)(context)), false), __read((0, gitlab_1.collapseableSection)("yarninstall", "Yarn install")([getYarnInstallCommand(context)])), false), __read(postInstall && !(options === null || options === void 0 ? void 0 : options.noCustomPostInstall) ? (0, gitlab_1.collapseableSection)("postinstall", "Custom post install")((_a = (0, utils_1.ensureArray)(postInstall)) !== null && _a !== void 0 ? _a : []) : []), false);
 };
 exports.getYarnInstall = getYarnInstall;

package/dist/build/rails/build.d.ts

@@ -1,3 +1,3 @@
-import type { ComponentContext } from "../..";
+import { type ComponentContext } from "../..";
 import type { CatladderJob } from "../../types/jobs";
 export declare const createRailsBuildJobs: (context: ComponentContext) => CatladderJob[];

package/dist/build/rails/build.js

@@ -45,6 +45,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createRailsBuildJobs = void 0;
+var __1 = require("../..");
 var base_1 = require("../base");
 var docker_1 = require("../docker");
 var types_1 = require("../types");
@@ -55,8 +56,12 @@ var createRailsBuildJobs = function (context) {
     // should not happen
     throw new Error("build type is not rails");
   }
+  // if its not a standalone build, we don't need to run tests
+  if (!(0, __1.componentContextIsStandaloneBuild)(context)) {
+    throw new Error("workspace builds are not supported for rails apps");
+  }
   if ((0, docker_1.hasDockerfile)(context)) {
-    return (0, base_1.createBuildJobs)(context, {
+    return (0, base_1.createComponentBuildJobs)(context, {
       appBuild: undefined,
       dockerBuild: {
         script: (0, docker_1.getDockerBuildDefaultScript)(context),
@@ -71,7 +76,7 @@ var createRailsBuildJobs = function (context) {
       v = _b[1];
     return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
   }).join(" ");
-  return (0, base_1.createBuildJobs)(context, {
+  return (0, base_1.createComponentBuildJobs)(context, {
     appBuild: undefined,
     dockerBuild: {
       variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.build.config.extraVars),

package/dist/build/rails/test.d.ts

@@ -1,3 +1,3 @@
-import type { ComponentContext } from "../..";
+import { type ComponentContext } from "../..";
 import type { CatladderJob } from "../../types/jobs";
 export declare const createRailsTestJobs: (context: ComponentContext) => CatladderJob[];

package/dist/build/rails/test.js

@@ -45,6 +45,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createRailsTestJobs = void 0;
+var __1 = require("../..");
 var utils_1 = require("../../utils");
 var createRailsTestJobs = function (context) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
@@ -53,6 +54,10 @@ var createRailsTestJobs = function (context) {
   if (context.trigger === "taggedRelease") {
     return [];
   }
+  // if its not a standalone build, we don't need to run tests
+  if (!(0, __1.componentContextIsStandaloneBuild)(context)) {
+    return [];
+  }
   var buildConfig = context.build.config;
   var base = {
     variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), (_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {}),

package/dist/build/sbom.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createSbomBuildJob = exports.SBOM_FILE = exports.SBOM_BUILD_JOB_NAME = void 0;
+var _1 = require(".");
 var utils_1 = require("../utils");
 exports.SBOM_BUILD_JOB_NAME = "🧾 sbom";
 exports.SBOM_FILE = "__sbom.json";
@@ -12,8 +13,8 @@ var createSbomBuildJob = function (context) {
   var buildConfig = context.build.config;
   var defaultImage = "aquasec/trivy:0.38.3";
   var defaultScript = ["trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(context.packageManagerInfo.componentIsInWorkspace ? "." : context.build.dir)];
-  var image = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_b = (_a = buildConfig.sbom) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : defaultImage : defaultImage;
-  var script = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_d = (0, utils_1.ensureArray)((_c = buildConfig.sbom) === null || _c === void 0 ? void 0 : _c.command)) !== null && _d !== void 0 ? _d : defaultScript : defaultScript;
+  var image = (0, _1.isStandaloneBuildConfig)(buildConfig) && buildConfig.type === "custom" && buildConfig.sbom !== false ? (_b = (_a = buildConfig.sbom) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : defaultImage : defaultImage;
+  var script = (0, _1.isStandaloneBuildConfig)(buildConfig) && buildConfig.type === "custom" && buildConfig.sbom !== false ? (_d = (0, utils_1.ensureArray)((_c = buildConfig.sbom) === null || _c === void 0 ? void 0 : _c.command)) !== null && _d !== void 0 ? _d : defaultScript : defaultScript;
   return {
     name: exports.SBOM_BUILD_JOB_NAME,
     stage: "build",

package/dist/build/types.d.ts

@@ -111,6 +111,7 @@ export type BuildConfigMeteor = BuildConfigNodeBase & {
   installScripts?: boolean;
   docker?: Omit<BuildConfigDockerBuiltInMeteor, "type"> | BuildConfigDocker;
 };
+export type BuildConfigNodeLike = BuildConfigNode | BuildConfigNodeStatic | BuildConfigStorybook | BuildConfigMeteor;
 type BuildConfigDockerWithAdditions = {
   /**
    * Custom Dockerfile lines integrated in the generated Dockerfile before the standard build steps.
@@ -217,12 +218,24 @@ export type BuildConfigStorybook = BuildConfigNodeBase & {
   type: "storybook";
   startCommand?: never;
 };
-export type BuildConfig = BuildConfigNode | BuildConfigNodeStatic | BuildConfigStorybook | BuildConfigMeteor | BuildConfigCustom | BuildConfigRails;
-export type BuildConfigType = BuildConfig["type"];
-export type BuildConfigGeneric<T extends BuildConfigType> = Extract<BuildConfig, {
+export type BuildConfigFromWorkspace = {
+  from: string;
+  docker?: BuildConfigDocker;
+  startCommand?: string;
+  /**
+   * additional paths for artifacts,
+   * by default "dist" and ".next" are allways included
+   */
+  artifactsPaths?: string[];
+};
+export type BuildConfigStandalone = BuildConfigNode | BuildConfigNodeStatic | BuildConfigStorybook | BuildConfigMeteor | BuildConfigCustom | BuildConfigRails;
+export type BuildConfig = BuildConfigFromWorkspace | BuildConfigStandalone;
+export type BuildConfigStandaloneType = BuildConfigStandalone["type"];
+export type BuildConfigGeneric<T extends BuildConfigStandaloneType> = Extract<BuildConfig, {
   type: T;
 }>;
-export declare const isOfBuildType: <T extends ("node" | "node-static" | "storybook" | "meteor" | "custom" | "rails")[]>(t: BuildConfig, ...types: T) => t is Extract<BuildConfigNode, {
+export declare const isStandaloneBuildConfig: (t: BuildConfig | false) => t is BuildConfigStandalone;
+export declare const isOfBuildType: <T extends ("custom" | "rails" | "node" | "meteor" | "node-static" | "storybook")[]>(t: BuildConfig, ...types: T) => t is Extract<BuildConfigNode, {
   type: T[number];
 }> | Extract<BuildConfigNodeStatic, {
   type: T[number];
@@ -235,4 +248,35 @@ export declare const isOfBuildType: <T extends ("node" | "node-static" | "storyb
 }> | Extract<BuildConfigRails, {
   type: T[number];
 }>;
+export type WorkspaceBuildConfigBase = {
+  dir?: string;
+  /**
+   * customize lint, set false to disable
+   */
+  lint?: false | TestJobCustom;
+  /**
+   * customize test, set false to disable
+   */
+  test?: false | TestJobCustom;
+  /**
+   * customize audit, set false to disable
+   */
+  audit?: false | TestJobCustom;
+  /**
+   * additional vars only for the runner.
+   * Also if you use services: that require env vars, you need to set them here.
+   *
+   */
+  runnerVariables?: Record<string, string>;
+  /**
+   * additional CI/CD artifacts reports,
+   * use to display information in merge requests, pipeline views and security dashboards.
+   */
+  artifactsReports?: BuildConfigArtifactsReports;
+};
+export type WorkspaceBuildConfigNode = {
+  type: "node";
+  buildCommand?: string | string[];
+} & WorkspaceBuildConfigBase;
+export type WorkspaceBuildConfig = WorkspaceBuildConfigNode;
 export {};

package/dist/build/types.js

@@ -3,12 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isOfBuildType = void 0;
+exports.isOfBuildType = exports.isStandaloneBuildConfig = void 0;
+var isStandaloneBuildConfig = function (t) {
+  if (!t) return false;
+  return !("from" in t);
+};
+exports.isStandaloneBuildConfig = isStandaloneBuildConfig;
 var isOfBuildType = function (t) {
   var types = [];
   for (var _i = 1; _i < arguments.length; _i++) {
     types[_i - 1] = arguments[_i];
   }
+  if (!(0, exports.isStandaloneBuildConfig)(t)) return false;
   return types.includes(t.type);
 };
 exports.isOfBuildType = isOfBuildType;