@catladder/pipeline 3.25.0 → 3.26.0

package/src/pipeline/gitlab/createGitlabJobs.ts

@@ -15,6 +15,7 @@ import { collapseableSection } from "../../utils/gitlab";
 import { removeUndefined } from "../../utils/removeUndefined";
 import type { AllCatladderJobs } from "../createAllJobs";
 import { getBashVariable } from "../../bash/BashExpression";
+import { addCacheFallback } from "./cache";
 
 export type GitlabJobWithContext = {
   gitlabJob: GitlabJobDef;
@@ -60,12 +61,12 @@ const getFullReferencedJobNameFromComponent = (
       `unknown job referenced: '${referencedJobName}' from '${env}:${componentName}'`,
     );
   }
-  const envToSet = referencedJob.envMode !== "none" ? env : null;
+
   return getFullJobName({
     type: "component",
     name: referencedJobName,
     baseName: componentName,
-    env: envToSet,
+    env,
     allJobs,
   });
 };
@@ -84,13 +85,12 @@ const getFullReferencedJobNameFromWorkspace = (
       `unknown job referenced: '${referencedJobName}' from workspace ${env}:${workspaceName}'`,
     );
   }
-  const envToSet = referencedJob.envMode !== "none" ? env : null;
 
   return getFullJobName({
     type: "workspace",
     name: referencedJobName,
     baseName: workspaceName,
-    env: envToSet,
+    env,
     allJobs,
   });
 };
@@ -116,6 +116,7 @@ export const makeGitlabJob = (
     variables,
     runnerVariables,
     when,
+    cache,
     ...rest
   } = job;
   const stage =
@@ -133,8 +134,7 @@ export const makeGitlabJob = (
     type: context.type,
     name,
     baseName: context.name,
-    env:
-      envMode !== "none" && context.type !== "agent" ? context.env : undefined,
+    env: context.type !== "agent" ? context.env : undefined,
     allJobs,
   });
 
@@ -186,11 +186,11 @@ export const makeGitlabJob = (
         ? [{ when }]
         : []),
   ];
-
   const gitlabJob: GitlabJobDef = {
     retry: BASE_RETRY,
     interruptible: true,
     ...rest,
+    cache: cache ? addCacheFallback(cache, context) : undefined,
     rules: rules.length > 0 ? rules : undefined,
     variables: {
       ...legacyRunnerVariables,
@@ -283,8 +283,6 @@ export const createGitlabJobs = async (
   allJobs: AllCatladderJobs,
   baseRules?: GitlabRule[],
 ): Promise<AllGitlabJobs> => {
-  // TODO: add workspace jobs
-
   return [
     ...allJobs.workspaces,
     ...allJobs.components,

package/src/types/jobs.ts

@@ -38,11 +38,10 @@ export type CatladderJob<S = BaseStage> = {
   name: string;
   /**
    * envMode sets the behavior of the job regarding multiple envs:
-   * - none: the job does not run per env, but once for all envs
-   * - jobPerEnv: the job runs once per env
+   * - jobPerEnv: the job runs once per env (default)
    * - stagePerEnv: the job runs once per env and is organized in its own stage. This mproves usability in gitlab, but works the same as `jobPerEnv`
    */
-  envMode: "jobPerEnv" | "stagePerEnv" | "none";
+  envMode?: "jobPerEnv" | "stagePerEnv";
 
   /**
    * the stage of the job