@catladder/pipeline 1.168.0 → 1.168.2

package/src/deploy/custom/deployJob.ts

@@ -1,3 +1,4 @@
+import { getAllCacheConfigsFromConfig } from "../../build/cache/getAllCacheConfigsFromConfig";
 import { getYarnInstall } from "../../build/node/yarn";
 import { getRunnerImage } from "../../runner";
 import type { ComponentContext } from "../../types/context";
@@ -22,10 +23,11 @@ export const createCustomDeployJobs = (
   const yarnInstall = getYarnInstall(context, {
     noCustomPostInstall: true,
   });
-  return createDeployementJobs(context, {
+
+  const result = createDeployementJobs(context, {
     deploy: {
       image: deployConfig.jobImage ?? getRunnerImage("jobs-default"),
-      cache: deployConfig.jobCache ?? [],
+      cache: getAllCacheConfigsFromConfig(context, deployConfig),
       script: [
         `cd ${context.build.dir}`,
         ...(deployConfig.requiresYarnInstall ? yarnInstall : []),
@@ -45,4 +47,5 @@ export const createCustomDeployJobs = (
         }
       : undefined,
   });
+  return result;
 };

package/src/deploy/types/custom.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 = {
@@ -28,9 +28,5 @@ export type DeployConfigCustom = {
    * image to use
    */
   jobImage?: GitlabJobImage;
-
-  /**
-   * customize cache for the job
-   */
-  jobCache?: CatladderJob["cache"];
-} & DeployConfigBase;
+} & DeployConfigBase &
+  WithCacheConfig;

package/src/types/jobDefinition.ts

@@ -1,9 +1,34 @@
 import type { CacheConfig } from "../build";
-import { CacheConfigAdvanced, CacheConfigSimple } from "../build";
 import type { CatladderJob } from "./jobs";
 
-export type JobDefintion = Partial<
+// new intermediate types. Currently not widely used, but we will built a bit  more abstraction on top of this
+
+export type AppBuildJobDefinition = Partial<
   Omit<CatladderJob, "artifacts" | "cache">
 > & {
   cache?: CacheConfig[];
 };
+
+export type DockerBuildJobDefinition = AppBuildJobDefinition; // currently the same
+
+export type DeployJobDefinition = Pick<
+  CatladderJob,
+  | "script"
+  | "variables"
+  | "image"
+  | "artifacts"
+  | "services"
+  | "runnerVariables"
+> & {
+  cache?: CacheConfig[];
+};
+
+export type StopJobDefinition = Pick<
+  CatladderJob,
+  "script" | "variables" | "image" | "runnerVariables"
+>;
+
+export type RollbackJobDefinition = Pick<
+  CatladderJob,
+  "script" | "variables" | "runnerVariables" | "image"
+>;