@catladder/pipeline 1.165.1 → 1.166.0

package/dist/build/base/createAppBuildJob.d.ts

@@ -1,9 +1,11 @@
 import type { BuildContextStandalone, ComponentContext, WorkspaceContext } from "../..";
+import type { JobDefintion } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-export type AppBuildJobDefinition = Partial<Omit<CatladderJob, "artifacts">>;
+export type AppBuildJobDefinition = JobDefintion;
 export declare const createAppBuildJob: (context: ComponentContext<BuildContextStandalone> | WorkspaceContext, {
   script,
   variables,
   runnerVariables,
+  cache,
   ...def
 }: AppBuildJobDefinition) => CatladderJob;

package/dist/build/base/createAppBuildJob.js

@@ -57,30 +57,32 @@ var lodash_1 = require("lodash");
 var __1 = require("../..");
 var utils_1 = require("../../utils");
 var createBuildJobArtifact_1 = require("../artifacts/createBuildJobArtifact");
+var createJobCache_1 = require("../cache/createJobCache");
 var yarn_1 = require("../node/yarn");
 var constants_1 = require("./constants");
 var writeBuildInfo_1 = require("./writeBuildInfo");
 var writeDotEnv_1 = require("./writeDotEnv");
 var createAppBuildJob = function (context, _a) {
-  var _b, _c, _d;
+  var _b, _c;
   var script = _a.script,
     variables = _a.variables,
     runnerVariables = _a.runnerVariables,
-    def = __rest(_a, ["script", "variables", "runnerVariables"]);
+    cache = _a.cache,
+    def = __rest(_a, ["script", "variables", "runnerVariables", "cache"]);
   return (0, lodash_1.merge)({
     name: constants_1.APP_BUILD_JOB_NAME,
     envMode: "jobPerEnv",
     stage: "build",
     image: (0, __1.getRunnerImage)("jobs-default"),
     needs: [],
-    cache: [],
+    cache: cache ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, cache) : undefined,
     variables: __assign(__assign({}, variables !== null && variables !== void 0 ? variables : {}), context.type === "component" ? __assign(__assign(__assign({}, context.environment.envVars), context.environment.jobOnlyVars.build.envVars), (_b = context.build.config.extraVars) !== null && _b !== void 0 ? _b : {}) : {}),
     runnerVariables: __assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), runnerVariables !== null && runnerVariables !== void 0 ? runnerVariables : {}), (_c = context.build.config.runnerVariables) !== null && _c !== void 0 ? _c : {}),
     script: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(context.type === "component" ? (0, writeDotEnv_1.componentContextNeedsBuildTimeDotEnv)(context) ? (0, writeDotEnv_1.writeDotEnv)(context) : [] : context.type === "workspace" ? context.components.filter(function (c) {
       return (0, writeDotEnv_1.componentContextNeedsBuildTimeDotEnv)(c);
     }).flatMap(function (c) {
       return (0, writeDotEnv_1.writeDotEnv)(c);
-    }) : []), false), __read(context.type === "component" ? (0, writeBuildInfo_1.writeBuildInfo)(context) : []), false), __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.build.dir)], false), __read((_d = (0, utils_1.ensureArray)(script)) !== null && _d !== void 0 ? _d : []), false),
+    }) : []), false), __read(context.type === "component" ? (0, writeBuildInfo_1.writeBuildInfo)(context) : []), false), __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.build.dir)], false), __read((0, utils_1.ensureArray)(script)), false),
     artifacts: (0, createBuildJobArtifact_1.createBuildJobArtifacts)(context)
   }, def);
 };

package/dist/build/base/createBuildJobDefinition.d.ts

@@ -0,0 +1,7 @@
+import type { BuildConfigStandalone, WorkspaceBuildConfig } from "..";
+import type { Context } from "../../types";
+import type { JobDefintion } from "../../types/jobDefinition";
+export declare const createBuildJobDefinition: (context: Context, buildConfig: BuildConfigStandalone | WorkspaceBuildConfig, customize?: Pick<JobDefintion, "cache"> & {
+  prescript?: string[];
+  postscript?: string[];
+}) => JobDefintion | undefined;

package/dist/build/base/createBuildJobDefinition.js

@@ -0,0 +1,58 @@
+"use strict";
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createBuildJobDefinition = void 0;
+var runner_1 = require("../../runner");
+var utils_1 = require("../../utils");
+var getAllCacheConfigsFromConfig_1 = require("../cache/getAllCacheConfigsFromConfig");
+var constants_1 = require("../node/constants");
+var createBuildJobDefinition = function (context, buildConfig, customize) {
+  var _a, _b, _c, _d;
+  if (customize === void 0) {
+    customize = {};
+  }
+  if (buildConfig.buildCommand === null) return undefined;
+  var defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
+  return {
+    image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
+    runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
+    cache: __spreadArray(__spreadArray([], __read((_b = customize.cache) !== null && _b !== void 0 ? _b : []), false), __read((0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, buildConfig)), false),
+    services: "jobServices" in buildConfig ? buildConfig.jobServices : undefined,
+    script: __spreadArray(__spreadArray(__spreadArray([], __read((_c = customize.prescript) !== null && _c !== void 0 ? _c : []), false), __read((0, utils_1.ensureArray)(buildConfig.buildCommand)), false), __read((_d = customize.postscript) !== null && _d !== void 0 ? _d : []), false),
+    jobTags: buildConfig.jobTags
+  };
+};
+exports.createBuildJobDefinition = createBuildJobDefinition;

package/dist/build/cache/createJobCache.d.ts

@@ -0,0 +1,6 @@
+import type { BuildConfigStandalone, CacheConfig, WorkspaceBuildConfig } from "..";
+import type { Context } from "../../types";
+import type { CatladderJobCache } from "../../types/jobs";
+export declare const createJobCacheFromCacheConfigs: (context: Context, caches: CacheConfig[]) => CatladderJobCache[] | undefined;
+/** shortcut, used in some build types */
+export declare const createJobCacheFromConfig: (context: Context, buildConfig: BuildConfigStandalone | WorkspaceBuildConfig) => import("../../types").GitlabJobCache[] | undefined;

package/dist/build/cache/createJobCache.js

@@ -0,0 +1,109 @@
+"use strict";
+
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
+var __rest = this && this.__rest || function (s, e) {
+  var t = {};
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createJobCacheFromConfig = exports.createJobCacheFromCacheConfigs = void 0;
+var path_1 = require("path");
+var getAllCacheConfigsFromConfig_1 = require("./getAllCacheConfigsFromConfig");
+var createJobCacheFromCacheConfigs = function (context, caches) {
+  if (caches.length === 0) return undefined;
+  var simpleCacheDefs = caches.filter(function (c) {
+    return !("key" in c);
+  });
+  var advancedCacheDefs = caches.filter(function (c) {
+    return "key" in c;
+  });
+  // simple caches are merged together into one. This is because e.g. gitlab has a limit of 4 caches, see https://gitlab.com/gitlab-org/gitlab/-/issues/421962
+  var simpleCaches = simpleCacheDefs.length > 0 ? [{
+    key: context.name + "-default",
+    policy: "pull-push",
+    paths: simpleCacheDefs.flatMap(function (c) {
+      return c.paths.map(function (p) {
+        var _a;
+        var baseDir = c.pathMode === "absolute" ? "" : (_a = c.baseDir) !== null && _a !== void 0 ? _a : context.build.dir;
+        return (0, path_1.join)(baseDir, p);
+      });
+    })
+  }] : [];
+  var advancedCaches = advancedCacheDefs.map(function (_a) {
+    var _b;
+    var key = _a.key,
+      paths = _a.paths,
+      policy = _a.policy,
+      scope = _a.scope,
+      pathMode = _a.pathMode,
+      buildDir = _a.buildDir,
+      rest = __rest(_a, ["key", "paths", "policy", "scope", "pathMode", "buildDir"]);
+    var baseDir = pathMode === "absolute" ? "" : buildDir !== null && buildDir !== void 0 ? buildDir : context.build.dir;
+    var transformedKey = scope === "global" ? key : typeof key === "string" ? (scope === "buildDir" // really edge case...
+    ? baseDir : context.name) + "-" + key : __assign(__assign({}, key), {
+      files: (_b = key.files) === null || _b === void 0 ? void 0 : _b.map(function (f) {
+        return pathMode === "absolute" ? f : (0, path_1.join)(baseDir, f);
+      })
+    });
+    return __assign({
+      key: transformedKey,
+      policy: policy !== null && policy !== void 0 ? policy : "pull-push",
+      paths: pathMode === "absolute" ? paths : paths === null || paths === void 0 ? void 0 : paths.map(function (p) {
+        return (0, path_1.join)(baseDir, p);
+      })
+    }, rest);
+  });
+  return __spreadArray(__spreadArray([], __read(advancedCaches), false), __read(simpleCaches), false);
+};
+exports.createJobCacheFromCacheConfigs = createJobCacheFromCacheConfigs;
+/** shortcut, used in some build types */
+var createJobCacheFromConfig = function (context, buildConfig) {
+  return (0, exports.createJobCacheFromCacheConfigs)(context, (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, buildConfig));
+};
+exports.createJobCacheFromConfig = createJobCacheFromConfig;

package/dist/build/cache/getAllCacheConfigsFromConfig.d.ts

@@ -0,0 +1,3 @@
+import type { Context } from "../../types";
+import type { BuildConfigStandalone, CacheConfig, WorkspaceBuildConfig } from "../types";
+export declare const getAllCacheConfigsFromConfig: (context: Context, buildConfig: BuildConfigStandalone | WorkspaceBuildConfig) => CacheConfig[];

package/dist/build/cache/getAllCacheConfigsFromConfig.js

@@ -0,0 +1,66 @@
+"use strict";
+
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getAllCacheConfigsFromConfig = void 0;
+var index_1 = require("../../utils/index");
+var transformLegacyJobCache_1 = require("./transformLegacyJobCache");
+var getAllCacheConfigsFromConfig = function (context, buildConfig) {
+  return __spreadArray(__spreadArray(__spreadArray([], __read("jobCache" in buildConfig ? (0, transformLegacyJobCache_1.transformLegacyJobCache)(buildConfig.jobCache) : []), false), __read((0, index_1.ensureArray)(buildConfig.cache).map(function (c) {
+    return __assign(__assign({}, c), {
+      context: context
+    });
+  })), false), __read(context.type === "workspace" ?
+  // also add cache configs of the components of that workspace
+  context.components.flatMap(function (componentContext) {
+    var _a;
+    return (_a = (0, index_1.ensureArray)(componentContext.build.config.cache).map(function (c) {
+      return __assign(__assign({}, c), {
+        baseDir: componentContext.build.dir
+      });
+    })) !== null && _a !== void 0 ? _a : [];
+  }) : []), false);
+};
+exports.getAllCacheConfigsFromConfig = getAllCacheConfigsFromConfig;

package/dist/build/cache/transformLegacyJobCache.d.ts

@@ -0,0 +1,3 @@
+import type { CacheConfigAdvanced } from "..";
+import type { CatladderJobCache } from "../../types/jobs";
+export declare function transformLegacyJobCache(jobCache: CatladderJobCache | CatladderJobCache[] | undefined): CacheConfigAdvanced[];

package/dist/build/cache/transformLegacyJobCache.js

@@ -0,0 +1,29 @@
+"use strict";
+
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.transformLegacyJobCache = void 0;
+var utils_1 = require("../../utils");
+function transformLegacyJobCache(jobCache) {
+  return (0, utils_1.ensureArray)(jobCache).map(function (cache) {
+    var _a, _b;
+    return __assign(__assign({
+      pathMode: "absolute"
+    }, cache), {
+      key: (_a = cache.key) !== null && _a !== void 0 ? _a : "default",
+      paths: (_b = cache.paths) !== null && _b !== void 0 ? _b : []
+    });
+  });
+}
+exports.transformLegacyJobCache = transformLegacyJobCache;

package/dist/build/custom/buildJob.js

@@ -1,63 +1,20 @@
 "use strict";
 
-var __read = this && this.__read || function (o, n) {
-  var m = typeof Symbol === "function" && o[Symbol.iterator];
-  if (!m) return o;
-  var i = m.call(o),
-    r,
-    ar = [],
-    e;
-  try {
-    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-  } catch (error) {
-    e = {
-      error: error
-    };
-  } finally {
-    try {
-      if (r && !r.done && (m = i["return"])) m.call(i);
-    } finally {
-      if (e) throw e.error;
-    }
-  }
-  return ar;
-};
-var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
-  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-    if (ar || !(i in from)) {
-      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-      ar[i] = from[i];
-    }
-  }
-  return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createCustomBuildJobs = void 0;
-var utils_1 = require("../../utils");
 var docker_1 = require("../docker");
 var types_1 = require("../types");
 var base_1 = require("../base");
-var RUNNER_BUILD_VARIABLES = {
-  KUBERNETES_CPU_REQUEST: "0.45",
-  KUBERNETES_MEMORY_REQUEST: "1Gi",
-  KUBERNETES_MEMORY_LIMIT: "4Gi"
-};
+var createBuildJobDefinition_1 = require("../base/createBuildJobDefinition");
 var createCustomBuildJobs = function (context) {
-  var _a;
   var buildConfig = context.build.config;
   if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
     throw new Error("deploy config is not custom");
   }
   return (0, base_1.createComponentBuildJobs)(context, {
-    appBuild: buildConfig.buildCommand !== null ? {
-      image: buildConfig.jobImage,
-      runnerVariables: RUNNER_BUILD_VARIABLES,
-      cache: buildConfig.jobCache,
-      services: buildConfig.jobServices,
-      script: __spreadArray([], __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false)
-    } : undefined,
+    appBuild: buildConfig.buildCommand !== null ? (0, createBuildJobDefinition_1.createBuildJobDefinition)(context, buildConfig) : undefined,
     dockerBuild: {
       script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context),
       variables: {}

package/dist/build/custom/testJob.d.ts

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

package/dist/build/custom/testJob.js

@@ -46,15 +46,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createCustomTestJobs = void 0;
 var utils_1 = require("../../utils");
-var types_1 = require("../types");
 var createArtifactsConfig_1 = require("../base/createArtifactsConfig");
+var createJobCache_1 = require("../cache/createJobCache");
+var types_1 = require("../types");
 var RUNNER_CUSTOM_TEST_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.45",
   KUBERNETES_MEMORY_REQUEST: "1Gi",
   KUBERNETES_MEMORY_LIMIT: "4Gi"
 };
 var createCustomTestJobs = function (context) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
   // don't run tests after release
   // TODO: this will be replaced by using rules
   if (context.trigger === "taggedRelease") {
@@ -70,7 +71,7 @@ var createCustomTestJobs = function (context) {
     }, context.environment.jobOnlyVars.build.envVars), (_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {}),
     runnerVariables: RUNNER_CUSTOM_TEST_VARIABLES,
     services: buildConfig.jobServices,
-    cache: buildConfig.jobCache,
+    cache: (0, createJobCache_1.createJobCacheFromConfig)(context, buildConfig),
     stage: "test",
     needs: [],
     envMode: "none"
@@ -80,21 +81,21 @@ var createCustomTestJobs = function (context) {
   }, base), {
     image: (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : buildConfig.jobImage,
     cache: undefined,
-    script: __spreadArray([], __read((_e = (0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : []), false),
+    script: __spreadArray([], __read((0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)), false),
     allow_failure: true
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.artifactsReports, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.artifacts)) : null;
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.artifactsReports, (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.artifacts)) : null;
   var lintJob = buildConfig.lint ? __assign(__assign(__assign({
     name: "👮 lint"
   }, base), {
-    image: (_j = (_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.jobImage) !== null && _j !== void 0 ? _j : buildConfig.jobImage,
-    script: __spreadArray([], __read((_l = (0, utils_1.ensureArray)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : []), false)
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.artifactsReports, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.artifacts)) : null;
+    image: (_h = (_g = buildConfig.lint) === null || _g === void 0 ? void 0 : _g.jobImage) !== null && _h !== void 0 ? _h : buildConfig.jobImage,
+    script: __spreadArray([], __read((0, utils_1.ensureArray)((_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.command)), false)
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.artifactsReports, (_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.artifacts)) : null;
   var testJob = buildConfig.test ? __assign(__assign(__assign({
     name: "🧪 test"
   }, base), {
-    image: (_q = (_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.jobImage) !== null && _q !== void 0 ? _q : buildConfig.jobImage,
-    script: __spreadArray([], __read((_s = (0, utils_1.ensureArray)((_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.command)) !== null && _s !== void 0 ? _s : []), false)
-  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_t = buildConfig.test) === null || _t === void 0 ? void 0 : _t.artifactsReports, (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.artifacts)) : null;
+    image: (_o = (_m = buildConfig.test) === null || _m === void 0 ? void 0 : _m.jobImage) !== null && _o !== void 0 ? _o : buildConfig.jobImage,
+    script: __spreadArray([], __read((0, utils_1.ensureArray)((_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.command)), false)
+  }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.artifactsReports, (_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.artifacts)) : null;
   return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
 exports.createCustomTestJobs = createCustomTestJobs;

package/dist/build/docker.d.ts

@@ -1,5 +1,5 @@
 import type { BuildConfigDocker } from ".";
-import type { ComponentContext } from "../types";
+import type { ComponentContext, JobDefintion } from "../types";
 import type { CatladderJob } from "../types/jobs";
 export declare const getDockerImageVariables: (context: ComponentContext) => {
   DOCKER_IMAGE_TAG: string;
@@ -58,11 +58,12 @@ export declare const getDockerBuildVariables: (context: ComponentContext) => {
 };
 export declare const DOCKER_BUILD_JOB_NAME = "\uD83D\uDD28 docker";
 export declare const getDockerJobBaseProps: () => Pick<CatladderJob, "image" | "services" | "variables" | "runnerVariables">;
-export type DockerBuildJobDefinition = Partial<CatladderJob>;
+export type DockerBuildJobDefinition = JobDefintion;
 export declare const createDockerBuildJobBase: (context: ComponentContext, {
   script,
+  cache,
   ...def
-}: Partial<CatladderJob>) => CatladderJob;
+}: JobDefintion) => CatladderJob;
 export declare const gitlabDockerLogin: (context: ComponentContext) => string[];
 export declare const getDockerBuildScriptWithBuiltInDockerFile: (context: ComponentContext, defaultType?: BuildConfigDocker["type"]) => (string | undefined)[];
 export declare const getDockerBuildDefaultScript: (context: ComponentContext, ensureDockerFileScript?: string | null) => (string | undefined)[];

package/dist/build/docker.js

@@ -66,6 +66,7 @@ var artifactsRegistry_1 = require("../deploy/cloudRun/artifactsRegistry");
 var gcloudServiceAccountLoginCommands_1 = require("../deploy/cloudRun/utils/gcloudServiceAccountLoginCommands");
 var runner_1 = require("../runner");
 var gitlab_1 = require("../utils/gitlab");
+var createJobCache_1 = require("./cache/createJobCache");
 var DOCKER_BUILD_RUNNER_REQUESTS = {
   KUBERNETES_CPU_REQUEST: "0.45",
   KUBERNETES_MEMORY_REQUEST: "1Gi",
@@ -143,11 +144,13 @@ var getDockerJobBaseProps = function () {
 exports.getDockerJobBaseProps = getDockerJobBaseProps;
 var createDockerBuildJobBase = function (context, _a) {
   var script = _a.script,
-    def = __rest(_a, ["script"]);
+    cache = _a.cache,
+    def = __rest(_a, ["script", "cache"]);
   return (0, lodash_1.merge)(__assign(__assign({
     name: exports.DOCKER_BUILD_JOB_NAME,
     envMode: "jobPerEnv",
-    stage: "build"
+    stage: "build",
+    cache: cache ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, cache) : undefined
   }, (0, exports.getDockerJobBaseProps)()), {
     script: script || []
   }), {

package/dist/build/node/buildJob.js

@@ -35,14 +35,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createNodeDockerJobDefinition = exports.createNodeBuildJobDefinition = exports.createNodeBuildJobs = void 0;
-var runner_1 = require("../../runner");
 var context_1 = require("../../types/context");
-var utils_1 = require("../../utils");
 var base_1 = require("../base");
+var createBuildJobDefinition_1 = require("../base/createBuildJobDefinition");
 var docker_1 = require("../docker");
-var types_1 = require("../types");
 var cache_1 = require("./cache");
-var constants_1 = require("./constants");
 var yarn_1 = require("./yarn");
 var createNodeBuildJobs = function (context) {
   if (context.type === "workspace") {
@@ -57,21 +54,12 @@ var createNodeBuildJobs = function (context) {
 };
 exports.createNodeBuildJobs = createNodeBuildJobs;
 var createNodeBuildJobDefinition = function (context) {
-  var _a, _b, _c;
   var buildConfig = context.build.config;
-  if (!(0, types_1.isOfBuildType)(buildConfig, "node", "node-static", "storybook")) {
-    throw new Error("deploy config is not node, node-static or storybook");
-  }
-  if (buildConfig.buildCommand === null) return undefined;
-  var defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
-  return {
-    image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
-    runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
-    cache: __spreadArray(__spreadArray(__spreadArray([], __read((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : []), false), __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
-    script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : []), false),
-    jobTags: buildConfig.jobTags
-  };
+  return (0, createBuildJobDefinition_1.createBuildJobDefinition)(context, buildConfig, {
+    prescript: yarnInstall,
+    cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false)
+  });
 };
 exports.createNodeBuildJobDefinition = createNodeBuildJobDefinition;
 var createNodeDockerJobDefinition = function (context) {

package/dist/build/node/cache.d.ts

@@ -1,7 +1,7 @@
 import type { Context, WorkspaceContext } from "../../types/context";
-import type { GitlabJobCache } from "../../types/gitlab-types";
-export declare const getYarnCache: (context: Context, policy?: string) => GitlabJobCache[];
-export declare const getNodeModulesCache: (context: Context, policy?: string) => GitlabJobCache[];
-export declare const getNodeCache: (context: Context, policy?: string) => GitlabJobCache[];
-export declare const getNextCache: (context: Context) => GitlabJobCache[];
-export declare const getWorkspaceDefaultCaches: (context: WorkspaceContext) => GitlabJobCache[];
+import type { CacheConfig } from "../types";
+export declare const getYarnCache: (context: Context, policy?: string) => CacheConfig[];
+export declare const getNodeModulesCache: (context: Context, policy?: string) => CacheConfig[];
+export declare const getNodeCache: (context: Context, policy?: string) => CacheConfig[];
+export declare const getNextCache: (context: Context) => CacheConfig[];
+export declare const getWorkspaceDefaultCaches: (context: WorkspaceContext) => CacheConfig[];

package/dist/build/node/cache.js

@@ -48,14 +48,11 @@ var getYarnCache = function (context, policy) {
     policy = "pull-push";
   }
   var componentIsInWorkspace = context.type === "component" && context.packageManagerInfo.componentIsInWorkspace;
-  return [componentIsInWorkspace ? {
+  return [{
+    scope: componentIsInWorkspace ? "global" : "buildDir",
     key: "yarn",
     policy: policy,
     paths: [".yarn"]
-  } : {
-    key: (0, slugify_1.default)(context.build.dir) + "-yarn",
-    policy: policy,
-    paths: [(0, path_1.join)(context.build.dir, ".yarn")]
   }];
 };
 exports.getYarnCache = getYarnCache;
@@ -68,6 +65,8 @@ var getNodeModulesCache = function (context, policy) {
   // We intentionally do not use the contents of yarn.lock as a cache key, as yarn install should always guarantee that the files are updated, but it can still use part of the cache if not all packages are up-to-date.
   // It would slow down all pipelines whenever one adds a new dependency as it will need to download all node_modules again.
   return [{
+    scope: "global",
+    pathMode: "absolute",
     // if component is in a shared workspace, use workspace cache. use individual cache else
     key: componentIsInWorkspace ? "node-modules-workspace" : (0, slugify_1.default)(context.build.dir) + "-node-modules",
     // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
@@ -86,12 +85,12 @@ var getNodeCache = function (context, policy) {
 };
 exports.getNodeCache = getNodeCache;
 var getNextCache = function (context) {
-  var key = context.name + "-next-cache";
   var paths = context.build.getComponentDirs("direct").map(function (c) {
     return (0, path_1.join)(c, ".next/cache");
   });
   return [{
-    key: key,
+    pathMode: "absolute",
+    key: "next-cache",
     policy: "pull-push",
     paths: paths
   }];
@@ -100,9 +99,9 @@ exports.getNextCache = getNextCache;
 var getWorkspaceDefaultCaches = function (context) {
   return [{
     // turbo repo
-    key: context.name + "-turbo",
+    key: "turbo",
     policy: "pull-push",
-    paths: [(0, path_1.join)(context.build.dir, ".turbo")]
+    paths: [".turbo"]
   }];
 };
 exports.getWorkspaceDefaultCaches = getWorkspaceDefaultCaches;