@catladder/pipeline 3.25.0 → 3.26.0

package/dist/build/custom/testJob.js

@@ -73,8 +73,7 @@ var createCustomTestJobs = function (context) {
     services: buildConfig.jobServices,
     cache: (0, createJobCache_1.createJobCacheFromConfig)(context, buildConfig),
     stage: "test",
-    needs: [],
-    envMode: "none"
+    needs: []
   };
   var auditJob = buildConfig.audit ? __assign(__assign(__assign({
     name: "🛡 audit"

package/dist/build/node/testJob.js

@@ -71,8 +71,7 @@ var createNodeTestJobs = function (context) {
     }, context.type === "component" ? __assign({}, context.environment.jobOnlyVars.build.envVars) : {}),
     runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
     stage: "test",
-    needs: [],
-    envMode: "none"
+    needs: []
   };
   var buildConfig = context.build.config;
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);

package/dist/build/rails/test.js

@@ -62,8 +62,7 @@ var createRailsTestJobs = function (context) {
   var base = {
     variables: __assign({}, context.environment.jobOnlyVars.build.envVars),
     stage: "test",
-    needs: [],
-    envMode: "none"
+    needs: []
   };
   var defaultImage = "docker.io/ruby";
   var bundlerCacheDir = "tmp/cache";

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 = "v3-25-0-910b2ed7" || "latest";
+exports.PIPELINE_IMAGE_TAG = "v3-26-0-35d807bd" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

package/dist/pipeline/agent/createAgentReviewJob.js

@@ -69,6 +69,7 @@ var createAgentReviewJob = function (context) {
     };
   });
   return __assign(__assign({}, baseJob), {
+    envMode: "jobPerEnv",
     name: context.name + "-agent-review",
     allow_failure: true,
     rules: __spreadArray(__spreadArray([], __read(rules), false), [__assign(__assign({}, rules_1.RULE_IS_MERGE_REQUEST), {

package/dist/pipeline/agent/shared.d.ts

@@ -1,5 +1,5 @@
 import type { AgentContext, CatladderJob } from "../../types";
-export declare const createBaseAgentJob: (context: AgentContext) => Omit<CatladderJob, "name" | "rules" | "script">;
+export declare const createBaseAgentJob: (context: AgentContext) => Omit<CatladderJob, "name" | "rules" | "script" | "envMode">;
 export declare const baseSetupScript: string[];
 export declare const callClaude: ({
   prompt

package/dist/pipeline/agent/shared.js

@@ -9,7 +9,6 @@ var runner_1 = require("../../runner");
 var createBaseAgentJob = function (context) {
   return {
     stage: "agents",
-    envMode: "none",
     // image: "node:24-alpine3.21",
     image: (0, runner_1.getRunnerImage)("agent-claude"),
     variables: {

package/dist/pipeline/createMainPipeline.js

@@ -242,6 +242,7 @@ var createMainPipeline = function (pipelineType, config) {
               context = _a.context;
             // merge jobs, if a job is already there, merge the rules
             // this is currently needed because of envMode: "none", which creates the same job for all triggers, so it can appear multiple times
+            // NOTICE: envNode none has been removed and this may no longer be needed
             if (acc[name]) {
               acc[name].gitlabJob.rules = __spreadArray(__spreadArray([], __read((_b = acc[name].gitlabJob.rules) !== null && _b !== void 0 ? _b : []), false), __read((_c = gitlabJob.rules) !== null && _c !== void 0 ? _c : []), false);
             } else {

package/dist/pipeline/gitlab/cache.d.ts

@@ -0,0 +1,9 @@
+import type { AgentContext, Context, GitlabJobCache } from "../../types";
+export declare const getCacheKeyWithFallbackForMR: (baseKey: string, context: Context) => {
+  key: string;
+  fallback_keys: string[];
+} | {
+  key: string;
+  fallback_keys?: undefined;
+};
+export declare const addCacheFallback: (cache: GitlabJobCache | GitlabJobCache[], context: Context | AgentContext) => GitlabJobCache | GitlabJobCache[];

package/dist/pipeline/gitlab/cache.js

@@ -0,0 +1,47 @@
+"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.addCacheFallback = exports.getCacheKeyWithFallbackForMR = void 0;
+var getCacheKeyWithFallbackForMR = function (baseKey, context) {
+  // if its a branch, create a key with the branch name with fallback to the base key
+  if (context.trigger === "mr") {
+    return {
+      key: baseKey + "-mr$CI_MERGE_REQUEST_IID",
+      fallback_keys: [baseKey]
+    };
+  }
+  return {
+    key: baseKey
+  };
+};
+exports.getCacheKeyWithFallbackForMR = getCacheKeyWithFallbackForMR;
+var addCacheFallback = function (cache, context) {
+  if (context.type !== "agent" && context.trigger === "mr") {
+    if (Array.isArray(cache)) {
+      return cache.map(function (c) {
+        return addCacheFallbackToSingleCacheForMR(c, context);
+      });
+    }
+    return addCacheFallbackToSingleCacheForMR(cache, context);
+  }
+  return cache;
+};
+exports.addCacheFallback = addCacheFallback;
+var addCacheFallbackToSingleCacheForMR = function (cache, context) {
+  if (typeof cache.key === "string") {
+    return __assign(__assign({}, cache), (0, exports.getCacheKeyWithFallbackForMR)(cache.key, context));
+  }
+  return cache; // as is
+};

package/dist/pipeline/gitlab/createGitlabJobs.js

@@ -175,6 +175,7 @@ var utils_1 = require("../../utils");
 var gitlab_1 = require("../../utils/gitlab");
 var removeUndefined_1 = require("../../utils/removeUndefined");
 var BashExpression_1 = require("../../bash/BashExpression");
+var cache_1 = require("./cache");
 exports.GITLAB_ENVIRONMENT_URL_VARIABLE = "CL_GITLAB_ENVIRONMENT_URL";
 var getFullJobName = function (_a) {
   var type = _a.type,
@@ -200,12 +201,11 @@ var getFullReferencedJobNameFromComponent = function (referencedJobName, compone
   if (!referencedJob) {
     throw new Error("unknown job referenced: '".concat(referencedJobName, "' from '").concat(env, ":").concat(componentName, "'"));
   }
-  var envToSet = referencedJob.envMode !== "none" ? env : null;
   return getFullJobName({
     type: "component",
     name: referencedJobName,
     baseName: componentName,
-    env: envToSet,
+    env: env,
     allJobs: allJobs
   });
 };
@@ -219,12 +219,11 @@ var getFullReferencedJobNameFromWorkspace = function (referencedJobName, workspa
   if (!referencedJob) {
     throw new Error("unknown job referenced: '".concat(referencedJobName, "' from workspace ").concat(env, ":").concat(workspaceName, "'"));
   }
-  var envToSet = referencedJob.envMode !== "none" ? env : null;
   return getFullJobName({
     type: "workspace",
     name: referencedJobName,
     baseName: workspaceName,
-    env: envToSet,
+    env: env,
     allJobs: allJobs
   });
 };
@@ -243,14 +242,15 @@ var makeGitlabJob = function (context, job, allJobs, baseRules) {
     variables = job.variables,
     runnerVariables = job.runnerVariables,
     when = job.when,
-    rest = __rest(job, ["environment", "envMode", "needsStages", "name", "needs", "jobTags", "script", "variables", "runnerVariables", "when"]);
+    cache = job.cache,
+    rest = __rest(job, ["environment", "envMode", "needsStages", "name", "needs", "jobTags", "script", "variables", "runnerVariables", "when", "cache"]);
   var stage = envMode === "stagePerEnv" && context.type !== "agent" ? "".concat(job.stage, " ").concat(context.env) : job.stage;
   var deduplicatedGitlabNeeds = getGitlabNeeds(context, job, allJobs);
   var fullJobName = getFullJobName({
     type: context.type,
     name: name,
     baseName: context.name,
-    env: envMode !== "none" && context.type !== "agent" ? context.env : undefined,
+    env: context.type !== "agent" ? context.env : undefined,
     allJobs: allJobs
   });
   // backwards compatibility, some may still use KUBERNETES_CPU_REQUEST, KUBERNETES_MEMORY_REQUEST, etc. in variables.
@@ -283,6 +283,7 @@ var makeGitlabJob = function (context, job, allJobs, baseRules) {
     retry: defaults_1.BASE_RETRY,
     interruptible: true
   }, rest), {
+    cache: cache ? (0, cache_1.addCacheFallback)(cache, context) : undefined,
     rules: rules.length > 0 ? rules : undefined,
     variables: __assign(__assign({}, legacyRunnerVariables), runnerVariables),
     script: __spreadArray(__spreadArray([], __read(varsInjectScripts), false), __read((_b = script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil)) !== null && _b !== void 0 ? _b : []), false),
@@ -340,7 +341,6 @@ var addGitlabEnvironment = function (context, catladderJobEnvironment, job, allJ
 var createGitlabJobs = function (allJobs, baseRules) {
   return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
-      // TODO: add workspace jobs
       return [2 /*return*/, __spreadArray(__spreadArray(__spreadArray([], __read(allJobs.workspaces), false), __read(allJobs.components), false), __read(allJobs.agents), false).flatMap(function (_a) {
         var context = _a.context,
           jobs = _a.jobs;