@catladder/cli 0.0.0-refactor-docker-c24f8608 → 0.0.0-refactor-cache-b38c122b

package/dist/pipeline/src/build/cache/getAllCacheConfigsFromConfig.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAllCacheConfigsFromConfig = void 0;
+const index_1 = require("../../utils/index");
+const transformLegacyJobCache_1 = require("./transformLegacyJobCache");
+const getAllCacheConfigsFromConfig = (context, configWithCache) => {
+    return [
+        ...("jobCache" in configWithCache
+            ? (0, transformLegacyJobCache_1.transformLegacyJobCache)(configWithCache.jobCache)
+            : []),
+        ...(0, index_1.ensureArray)(configWithCache.cache),
+        ...(context.type === "workspace"
+            ? // also add cache configs of the components of that workspace
+                context.components.flatMap((componentContext) => {
+                    var _a;
+                    return (_a = (0, index_1.ensureArray)(componentContext.build.config.cache).map((c) => ({
+                        ...c,
+                        baseDir: componentContext.build.dir,
+                    }))) !== null && _a !== void 0 ? _a : [];
+                })
+            : []),
+    ];
+};
+exports.getAllCacheConfigsFromConfig = getAllCacheConfigsFromConfig;
+//# sourceMappingURL=getAllCacheConfigsFromConfig.js.map

package/dist/pipeline/src/build/cache/getAllCacheConfigsFromConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getAllCacheConfigsFromConfig.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/cache/getAllCacheConfigsFromConfig.ts"],"names":[],"mappings":";;;AACA,6CAAgD;AAEhD,uEAAoE;AAE7D,MAAM,4BAA4B,GAAG,CAC1C,OAAgB,EAChB,eAAgC,EACjB,EAAE;IACjB,OAAO;QACL,GAAG,CAAC,UAAU,IAAI,eAAe;YAC/B,CAAC,CAAC,IAAA,iDAAuB,EAAC,eAAe,CAAC,QAAQ,CAAC;YACnD,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,IAAA,mBAAW,EAAC,eAAe,CAAC,KAAK,CAAC;QACrC,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;YAC9B,CAAC,CAAC,6DAA6D;gBAC7D,OAAO,CAAC,UAAU,CAAC,OAAO,CACxB,CAAC,gBAAgB,EAAE,EAAE;;oBACnB,OAAA,MAAA,IAAA,mBAAW,EAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;wBAC3D,GAAG,CAAC;wBACJ,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC,GAAG;qBACpC,CAAC,CAAC,mCAAI,EAAE,CAAA;iBAAA,CACZ;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,4BAA4B,gCAoBvC"}

package/dist/pipeline/src/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/pipeline/src/build/cache/transformLegacyJobCache.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformLegacyJobCache = void 0;
+const utils_1 = require("../../utils");
+function transformLegacyJobCache(jobCache) {
+    return (0, utils_1.ensureArray)(jobCache).map((cache) => {
+        var _a, _b;
+        return ({
+            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;
+//# sourceMappingURL=transformLegacyJobCache.js.map

package/dist/pipeline/src/build/cache/transformLegacyJobCache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transformLegacyJobCache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/cache/transformLegacyJobCache.ts"],"names":[],"mappings":";;;AAEA,uCAA0C;AAE1C,SAAgB,uBAAuB,CACrC,QAA6D;IAE7D,OAAO,IAAA,mBAAW,EAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;;QAAC,OAAA,CAAC;YAC3C,QAAQ,EAAE,UAAU;YACpB,GAAG,KAAK;YACR,GAAG,EAAE,MAAA,KAAK,CAAC,GAAG,mCAAI,SAAS;YAC3B,KAAK,EAAE,MAAA,KAAK,CAAC,KAAK,mCAAI,EAAE;SACzB,CAAC,CAAA;KAAA,CAAC,CAAC;AACN,CAAC;AATD,0DASC"}

package/dist/pipeline/src/build/custom/buildJob.js

@@ -1,65 +1,18 @@
 "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 path_1 = require("path");
-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.5",
-    KUBERNETES_MEMORY_REQUEST: "2Gi",
-    KUBERNETES_MEMORY_LIMIT: "4Gi",
-};
-var createCustomBuildJobs = function (context) {
-    var _a, _b, _c;
-    var buildConfig = context.componentConfig.build;
+const docker_1 = require("../docker");
+const types_1 = require("../types");
+const base_1 = require("../base");
+const createBuildJobDefinition_1 = require("../base/createBuildJobDefinition");
+const createCustomBuildJobs = (context) => {
+    const buildConfig = context.build.config;
     if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
         throw new Error("deploy config is not custom");
     }
-    return (0, base_1.createBuildJobs)(context, {
+    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),
-                artifacts: {
-                    paths: __spreadArray([
-                        (0, path_1.join)(context.componentConfig.dir, "__build_info.json"),
-                        (0, path_1.join)(context.componentConfig.dir, "dist")
-                    ], __read(((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
-                        return (0, path_1.join)(context.componentConfig.dir, path);
-                    })) !== null && _c !== void 0 ? _c : [])), false),
-                    expire_in: "1 day",
-                },
-            }
+            ? (0, createBuildJobDefinition_1.createBuildJobDefinition)(context, buildConfig)
             : undefined,
         dockerBuild: {
             script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context),

package/dist/pipeline/src/build/custom/buildJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/buildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAE5B,qCAA0C;AAC1C,oCAAsE;AACtE,kCAAyC;AAGzC,gCAA0C;AAE1C,IAAM,sBAAsB,GAAG;IAC7B,sBAAsB,EAAE,KAAK;IAC7B,yBAAyB,EAAE,KAAK;IAChC,uBAAuB,EAAE,KAAK;CAC/B,CAAC;AAEK,IAAM,qBAAqB,GAAG,UACnC,OAAyB;;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC;IAElD,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,eAAe,EAAE,sBAAsB;gBACvC,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,QAAQ,EAAE,WAAW,CAAC,WAAW;gBACjC,MAAM,2BAAM,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,YAAY,CAAC,mCAAI,EAAE,CAAC,SAAC;gBAC1D,SAAS,EAAE;oBACT,KAAK;wBACH,IAAA,WAAI,EAAC,OAAO,CAAC,eAAe,CAAC,GAAG,EAAE,mBAAmB,CAAC;wBACtD,IAAA,WAAI,EAAC,OAAO,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC;8BACtC,CAAC,MAAA,MAAA,WAAW,CAAC,cAAc,0CAAE,GAAG,CAAC,UAAC,IAAI;wBACvC,OAAA,IAAA,WAAI,EAAC,OAAO,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC;oBAAvC,CAAuC,CACxC,mCAAI,EAAE,CAAC,SACT;oBACD,SAAS,EAAE,OAAO;iBACnB;aACF;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAAC,OAAO,CAAC;YAE1D,SAAS,EAAE,EAAE;SACd;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AApCW,QAAA,qBAAqB,yBAoChC"}
+{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/buildJob.ts"],"names":[],"mappings":";;;AACA,sCAAsE;AACtE,oCAAyC;AAGzC,kCAAmD;AACnD,+EAA4E;AAErE,MAAM,qBAAqB,GAAG,CACnC,OAAyB,EACT,EAAE;IAClB,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC,IAAA,mDAAwB,EAAC,OAAO,EAAE,WAAW,CAAC;YAChD,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAAC,OAAO,CAAC;YAE1D,SAAS,EAAE,EAAE;SACd;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AApBW,QAAA,qBAAqB,yBAoBhC"}

package/dist/pipeline/src/build/custom/index.js

@@ -1,35 +1,10 @@
 "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.createCustomJobs = void 0;
-var buildJob_1 = require("./buildJob");
-var testJob_1 = require("./testJob");
-var createCustomJobs = function (context) {
-    return __spreadArray(__spreadArray([], __read((0, testJob_1.createCustomTestJobs)(context)), false), __read((0, buildJob_1.createCustomBuildJobs)(context)), false);
+const buildJob_1 = require("./buildJob");
+const testJob_1 = require("./testJob");
+const createCustomJobs = (context) => {
+    return [...(0, testJob_1.createCustomTestJobs)(context), ...(0, buildJob_1.createCustomBuildJobs)(context)];
 };
 exports.createCustomJobs = createCustomJobs;
 //# sourceMappingURL=index.js.map

package/dist/pipeline/src/build/custom/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,uCAAmD;AACnD,qCAAiD;AAE1C,IAAM,gBAAgB,GAAG,UAAC,OAAyB;IACxD,8CAAW,IAAA,8BAAoB,EAAC,OAAO,CAAC,kBAAK,IAAA,gCAAqB,EAAC,OAAO,CAAC,UAAE;AAC/E,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/index.ts"],"names":[],"mappings":";;;AAEA,yCAAmD;AACnD,uCAAiD;AAE1C,MAAM,gBAAgB,GAAG,CAAC,OAAyB,EAAkB,EAAE;IAC5E,OAAO,CAAC,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,EAAE,GAAG,IAAA,gCAAqB,EAAC,OAAO,CAAC,CAAC,CAAC;AAC/E,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B"}

package/dist/pipeline/src/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/pipeline/src/build/custom/testJob.js

@@ -1,76 +1,68 @@
 "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.createCustomTestJobs = void 0;
-var utils_1 = require("../../utils");
-var types_1 = require("../types");
-var createArtifactsConfig_1 = require("../base/createArtifactsConfig");
-var RUNNER_CUSTOM_TEST_VARIABLES = {
-    KUBERNETES_CPU_REQUEST: "0.5",
-    KUBERNETES_MEMORY_REQUEST: "2Gi",
+const utils_1 = require("../../utils");
+const createArtifactsConfig_1 = require("../base/createArtifactsConfig");
+const createJobCache_1 = require("../cache/createJobCache");
+const types_1 = require("../types");
+const 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;
+const createCustomTestJobs = (context) => {
+    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") {
         return [];
     }
-    var buildConfig = context.componentConfig.build;
+    const buildConfig = context.build.config;
     if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
         throw new Error("deploy config is not custom");
     }
-    var base = {
-        variables: __assign(__assign({ APP_PATH: context.componentConfig.dir }, context.environment.jobOnlyVars.build.envVars), ((_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {})),
+    const base = {
+        variables: {
+            APP_PATH: context.build.dir,
+            ...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",
     };
-    var auditJob = buildConfig.audit
-        ? __assign(__assign(__assign({ name: "🛡 audit" }, 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), allow_failure: true }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.componentConfig.dir, (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.artifactsReports, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.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.componentConfig.dir, (_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.artifactsReports, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.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.componentConfig.dir, (_t = buildConfig.test) === null || _t === void 0 ? void 0 : _t.artifactsReports, (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.artifacts)) : null;
+    const auditJob = buildConfig.audit
+        ? {
+            name: "🛡 audit",
+            ...base,
+            image: (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : buildConfig.jobImage,
+            cache: undefined,
+            script: [...(0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)],
+            allow_failure: true,
+            ...(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;
+    const lintJob = buildConfig.lint
+        ? {
+            name: "👮 lint",
+            ...base,
+            image: (_h = (_g = buildConfig.lint) === null || _g === void 0 ? void 0 : _g.jobImage) !== null && _h !== void 0 ? _h : buildConfig.jobImage,
+            script: [...(0, utils_1.ensureArray)((_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.command)],
+            ...(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;
+    const testJob = buildConfig.test
+        ? {
+            name: "🧪 test",
+            ...base,
+            image: (_o = (_m = buildConfig.test) === null || _m === void 0 ? void 0 : _m.jobImage) !== null && _o !== void 0 ? _o : buildConfig.jobImage,
+            script: [...(0, utils_1.ensureArray)((_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.command)],
+            ...(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/pipeline/src/build/custom/testJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/testJob.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/testJob.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/build/docker.d.ts

@@ -1,5 +1,5 @@
 import type { BuildConfigDocker } from ".";
-import type { ComponentContext } from "../types";
+import type { ComponentContext, DockerBuildJobDefinition } from "../types";
 import type { CatladderJob } from "../types/jobs";
 export declare const getDockerImageVariables: (context: ComponentContext) => {
     DOCKER_IMAGE_TAG: string;
@@ -16,14 +16,14 @@ export declare const getDockerImageVariables: (context: ComponentContext) => {
 /**
  * Weather the context requires a docker build
  */
-export declare const requiresDockerBuild: ({ componentConfig: { deploy }, }: ComponentContext) => boolean;
+export declare const requiresDockerBuild: (context: ComponentContext) => boolean;
 export declare const getDockerBuildVariables: (context: ComponentContext) => {
     DOCKER_IMAGE_TAG: string;
     DOCKER_REGISTRY: string;
     DOCKER_IMAGE: import("../bash/BashExpression").StringOrBashExpression;
     DOCKER_CACHE_IMAGE: string;
     APP_DIR: string;
-    DOCKER_DIR: string;
+    DOCKER_BUILD_CONTEXT: string;
     DOCKERFILE_ADDITIONS?: undefined;
     DOCKERFILE_ADDITIONS_END?: undefined;
 } | {
@@ -33,7 +33,7 @@ export declare const getDockerBuildVariables: (context: ComponentContext) => {
     DOCKER_IMAGE_NAME: string;
     DOCKER_IMAGE: string;
     APP_DIR: string;
-    DOCKER_DIR: string;
+    DOCKER_BUILD_CONTEXT: string;
     DOCKERFILE_ADDITIONS?: undefined;
     DOCKERFILE_ADDITIONS_END?: undefined;
 } | {
@@ -42,7 +42,7 @@ export declare const getDockerBuildVariables: (context: ComponentContext) => {
     DOCKER_IMAGE: import("../bash/BashExpression").StringOrBashExpression;
     DOCKER_CACHE_IMAGE: string;
     APP_DIR: string;
-    DOCKER_DIR: string;
+    DOCKER_BUILD_CONTEXT: string;
     DOCKERFILE_ADDITIONS: string;
     DOCKERFILE_ADDITIONS_END: string;
 } | {
@@ -52,14 +52,13 @@ export declare const getDockerBuildVariables: (context: ComponentContext) => {
     DOCKER_IMAGE_NAME: string;
     DOCKER_IMAGE: string;
     APP_DIR: string;
-    DOCKER_DIR: string;
+    DOCKER_BUILD_CONTEXT: string;
     DOCKERFILE_ADDITIONS: string;
     DOCKERFILE_ADDITIONS_END: string;
 };
 export declare const DOCKER_BUILD_JOB_NAME = "\uD83D\uDD28 docker";
-export declare const getDockerJobBaseProps: (context: ComponentContext) => Pick<CatladderJob, "image" | "services" | "variables" | "runnerVariables">;
-export type DockerBuildJobDefinition = Partial<CatladderJob>;
-export declare const createDockerBuildJobBase: (context: ComponentContext, { script, ...def }: Partial<CatladderJob>) => CatladderJob;
+export declare const getDockerJobBaseProps: () => Pick<CatladderJob, "image" | "services" | "variables" | "runnerVariables">;
+export declare const createDockerBuildJobBase: (context: ComponentContext, { script, cache, ...def }: DockerBuildJobDefinition) => CatladderJob;
 export declare const gitlabDockerLogin: (context: ComponentContext) => string[];
 export declare const getDockerBuildScriptWithBuiltInDockerFile: (context: ComponentContext, defaultType?: BuildConfigDocker["type"]) => string[];
 export declare const getDockerBuildDefaultScript: (context: ComponentContext, ensureDockerFileScript?: string | null) => string[];