@catladder/pipeline 1.168.0 → 1.168.1

package/dist/constants.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "v1-168-0-99f1fffa" || "latest";
+exports.PIPELINE_IMAGE_TAG = "v1-168-1-1cf21d4c" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

package/dist/context/getEnvironmentVariables.d.ts

@@ -9,7 +9,7 @@ export type SecretEnvVar = {
 declare const getBasePredefinedVariables: (ctx: EnvironmentContext) => {
   ENV_SHORT: string;
   APP_DIR: string;
-  ENV_TYPE: "dev" | "review" | "stage" | "prod" | "local";
+  ENV_TYPE: "stage" | "dev" | "review" | "prod" | "local";
 };
 type BasePredefinedVariables = ReturnType<typeof getBasePredefinedVariables>;
 export type PredefinedVariables = BasePredefinedVariables & {

package/dist/deploy/base/deploy.d.ts

@@ -1,5 +1,5 @@
+import type { DeployJobDefinition } from "../../types";
 import { type ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 export declare const DEPLOY_JOB_NAME = "\uD83D\uDE80 Deploy";
-export type DeployJobDefinition = Pick<CatladderJob, "script" | "variables" | "image" | "cache" | "artifacts" | "services" | "runnerVariables">;
 export declare const createDeployJob: (context: ComponentContext, jobDefinition: DeployJobDefinition) => CatladderJob;

package/dist/deploy/base/deploy.js

@@ -45,6 +45,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createDeployJob = exports.DEPLOY_JOB_NAME = void 0;
+var createJobCache_1 = require("../../build/cache/createJobCache");
 var docker_1 = require("../../build/docker");
 var sbom_1 = require("../../build/sbom");
 var context_1 = require("../../types/context");
@@ -70,7 +71,7 @@ var createDeployJob = function (context, jobDefinition) {
     name: exports.DEPLOY_JOB_NAME,
     script: jobDefinition.script,
     image: jobDefinition.image,
-    cache: jobDefinition.cache,
+    cache: jobDefinition.cache ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, jobDefinition.cache) : undefined,
     artifacts: jobDefinition.artifacts,
     services: jobDefinition.services,
     envMode: "stagePerEnv",

package/dist/deploy/base/index.d.ts

@@ -1,8 +1,6 @@
 import type { ComponentContext } from "../../types/context";
+import type { DeployJobDefinition, RollbackJobDefinition, StopJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-import { type DeployJobDefinition } from "./deploy";
-import { type RollbackJobDefinition } from "./rollback";
-import { type StopJobDefinition } from "./stop";
 export declare const createDeployementJobs: (context: ComponentContext, definitions: {
   deploy: DeployJobDefinition;
   stop?: StopJobDefinition;

package/dist/deploy/base/rollback.d.ts

@@ -1,5 +1,5 @@
 import type { ComponentContext } from "../../types/context";
+import type { RollbackJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
 export declare const ROLLBACK_JOB_NAME = "\u21A9\uFE0F Rollback \u26A0\uFE0F";
-export type RollbackJobDefinition = Pick<CatladderJob, "script" | "variables" | "runnerVariables" | "image">;
 export declare const createRollbackJob: (context: ComponentContext, jobDefinition: RollbackJobDefinition) => CatladderJob;

package/dist/deploy/base/stop.d.ts

@@ -1,5 +1,5 @@
 import type { ComponentContext } from "../../types/context";
+import type { StopJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
 export declare const STOP_JOB_NAME = "\uD83D\uDED1 Stop \u26A0\uFE0F";
-export type StopJobDefinition = Pick<CatladderJob, "script" | "variables" | "image" | "runnerVariables">;
 export declare const createStopJob: (context: ComponentContext, jobDefinition: StopJobDefinition) => CatladderJob;

package/dist/deploy/custom/deployJob.js

@@ -35,13 +35,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createCustomDeployJobs = void 0;
+var getAllCacheConfigsFromConfig_1 = require("../../build/cache/getAllCacheConfigsFromConfig");
 var yarn_1 = require("../../build/node/yarn");
 var runner_1 = require("../../runner");
 var base_1 = require("../base");
 var sbom_1 = require("../sbom");
 var types_1 = require("../types");
 var createCustomDeployJobs = function (context) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!(0, types_1.isOfDeployType)(deployConfig, "custom")) {
     // should not happen
@@ -51,18 +52,19 @@ var createCustomDeployJobs = function (context) {
   var yarnInstall = (0, yarn_1.getYarnInstall)(context, {
     noCustomPostInstall: true
   });
-  return (0, base_1.createDeployementJobs)(context, {
+  var result = (0, base_1.createDeployementJobs)(context, {
     deploy: {
       image: (_b = deployConfig.jobImage) !== null && _b !== void 0 ? _b : (0, runner_1.getRunnerImage)("jobs-default"),
-      cache: (_c = deployConfig.jobCache) !== null && _c !== void 0 ? _c : [],
+      cache: (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, deployConfig),
       script: __spreadArray(__spreadArray(__spreadArray(["cd ".concat(context.build.dir)], __read(deployConfig.requiresYarnInstall ? yarnInstall : []), false), __read(deployConfig.script), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false),
       variables: {}
     },
     stop: deployConfig.stopScript ? {
-      image: (_d = deployConfig.jobImage) !== null && _d !== void 0 ? _d : (0, runner_1.getRunnerImage)("jobs-default"),
+      image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
       script: __spreadArray(__spreadArray([], __read(deployConfig.stopScript), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false),
       variables: {}
     } : undefined
   });
+  return result;
 };
 exports.createCustomDeployJobs = createCustomDeployJobs;

package/dist/deploy/types/custom.d.ts

@@ -1,5 +1,5 @@
+import type { WithCacheConfig } from "../../build";
 import type { GitlabJobImage } from "../../types";
-import type { CatladderJob } from "../../types/jobs";
 import type { DeployConfigBase } from "./base";
 export type DeployConfigCustom = {
   /**
@@ -26,8 +26,4 @@ export type DeployConfigCustom = {
    * image to use
    */
   jobImage?: GitlabJobImage;
-  /**
-   * customize cache for the job
-   */
-  jobCache?: CatladderJob["cache"];
-} & DeployConfigBase;
+} & DeployConfigBase & WithCacheConfig;