@catladder/pipeline 3.13.0 → 3.14.0

package/dist/pipeline/gitlab/createGitlabJobs.js

@@ -183,7 +183,7 @@ var getFullJobName = function (_a) {
     allJobs = _a.allJobs,
     env = _a.env;
   var shouldAddIcon = allJobs.workspaces.length > 0;
-  var icon = type === "component" ? "🔹" : "🔸";
+  var icon = type === "component" ? "🔹" : type === "agent" ? "🤖" : "🔸";
   var prefix = shouldAddIcon ? icon + " " : "";
   if (env) {
     return "".concat(prefix).concat(baseName, " ").concat(name, " | ").concat(env, " ");
@@ -244,13 +244,13 @@ var makeGitlabJob = function (context, job, allJobs, baseRules) {
     runnerVariables = job.runnerVariables,
     when = job.when,
     rest = __rest(job, ["environment", "envMode", "needsStages", "name", "needs", "jobTags", "script", "variables", "runnerVariables", "when"]);
-  var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(context.env) : job.stage;
+  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.env : undefined,
+    env: envMode !== "none" && context.type !== "agent" ? context.env : undefined,
     allJobs: allJobs
   });
   // backwards compatibility, some may still use KUBERNETES_CPU_REQUEST, KUBERNETES_MEMORY_REQUEST, etc. in variables.
@@ -279,16 +279,17 @@ var makeGitlabJob = function (context, job, allJobs, baseRules) {
   }) : when ? [{
     when: when
   }] : []), false);
-  var gitlabJob = __assign(__assign({}, rest), {
+  var gitlabJob = __assign(__assign({
+    retry: defaults_1.BASE_RETRY,
+    interruptible: true
+  }, rest), {
     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),
     tags: jobTags,
     stage: stage,
     // sort in a predictable manner for snapshot tests
-    needs: deduplicatedGitlabNeeds,
-    retry: defaults_1.BASE_RETRY,
-    interruptible: true
+    needs: deduplicatedGitlabNeeds
   });
   var modified = addGitlabEnvironment(context, environment, gitlabJob, allJobs);
   return [fullJobName, (0, removeUndefined_1.removeUndefined)(modified)];
@@ -300,7 +301,7 @@ var addGitlabEnvironment = function (context, catladderJobEnvironment, job, allJ
     return job;
   }
   if (context.type !== "component") {
-    // don't add enviornment for workspace jobs atm.
+    // don't add enviornment for workspace and agent jobs atm.
     return job;
   }
   var env = context.env,
@@ -340,7 +341,7 @@ 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([], __read(allJobs.workspaces), false), __read(allJobs.components), false).flatMap(function (_a) {
+      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;
         return jobs.map(function (job) {
@@ -359,8 +360,9 @@ var createGitlabJobs = function (allJobs, baseRules) {
 };
 exports.createGitlabJobs = createGitlabJobs;
 function getGitlabNeeds(context, job, allJobs) {
-  var needs = context.type === "workspace" ? getGitlabNeedsForWorkspaceJob(context, job, allJobs) : getGitlabNeedsForComponentJob(context, job, allJobs);
-  return deduplicateNeeds(needs);
+  var _a;
+  var needs = context.type === "workspace" ? getGitlabNeedsForWorkspaceJob(context, job, allJobs) : context.type === "agent" ? (_a = job.needs) !== null && _a !== void 0 ? _a : null : getGitlabNeedsForComponentJob(context, job, allJobs);
+  return needs ? deduplicateNeeds(needs) : undefined;
 }
 function deduplicateNeeds(needs) {
   return needs ? __spreadArray([], __read(new Map(needs.map(function (n) {

package/dist/pipeline/gitlab/createGitlabPipeline.js

@@ -76,6 +76,12 @@ var createGitlabPipelineWithDefaults = function (_a) {
     workflow: {
       name: "$PIPELINE_ICON $PIPELINE_NAME",
       rules: [{
+        if: '$CI_PIPELINE_SOURCE  == "trigger"',
+        variables: {
+          PIPELINE_ICON: "🤖",
+          PIPELINE_NAME: "Thinking..."
+        }
+      }, {
         if: rules_1.RULE_IS_MERGE_REQUEST.if,
         variables: {
           PIPELINE_ICON: "🐱🔨",
@@ -91,7 +97,7 @@ var createGitlabPipelineWithDefaults = function (_a) {
         if: rules_1.RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT.if,
         variables: {
           PIPELINE_ICON: "🐱🔨",
-          PIPELINE_NAME: "Main $CI_COMMIT_REF_NAME"
+          PIPELINE_NAME: "Main"
         }
       }, {
         when: "always",

package/dist/rules/index.d.ts

@@ -5,6 +5,7 @@ export declare const RULE_CONDITION_NOT_RELEASE_COMMIT = "$CI_COMMIT_MESSAGE !~
 export declare const RULE_IS_MAIN_BRANCH: GitlabRule;
 export declare const RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT: GitlabRule;
 export declare const RULE_NEVER_ON_RELEASE_COMMIT: GitlabRule;
+export declare const RULE_NEVER_ON_AGENT_TRIGGER: GitlabRule;
 export declare const RULE_NEVER_ON_SCHEDULE: GitlabRule;
 export declare const RULE_IS_MERGE_REQUEST: GitlabRule;
 export declare const RULE_IS_TAGGED_RELEASE: GitlabRule;

package/dist/rules/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RULES_MANUAL_RELEASE = exports.RULES_RELEASE = exports.RULE_CONDITION_HOTFIX_BRANCH = exports.RULE_IS_TAGGED_RELEASE = exports.RULE_IS_MERGE_REQUEST = exports.RULE_NEVER_ON_SCHEDULE = exports.RULE_NEVER_ON_RELEASE_COMMIT = exports.RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT = exports.RULE_IS_MAIN_BRANCH = exports.RULE_CONDITION_NOT_RELEASE_COMMIT = exports.RULE_CONDITION_RELEASE_COMMIT = exports.RULE_CONDITION_MAIN_BRANCH = void 0;
+exports.RULES_MANUAL_RELEASE = exports.RULES_RELEASE = exports.RULE_CONDITION_HOTFIX_BRANCH = exports.RULE_IS_TAGGED_RELEASE = exports.RULE_IS_MERGE_REQUEST = exports.RULE_NEVER_ON_SCHEDULE = exports.RULE_NEVER_ON_AGENT_TRIGGER = exports.RULE_NEVER_ON_RELEASE_COMMIT = exports.RULE_IS_MAIN_BRANCH_AND_NOT_RELEASE_COMMIT = exports.RULE_IS_MAIN_BRANCH = exports.RULE_CONDITION_NOT_RELEASE_COMMIT = exports.RULE_CONDITION_RELEASE_COMMIT = exports.RULE_CONDITION_MAIN_BRANCH = void 0;
 exports.RULE_CONDITION_MAIN_BRANCH = "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH";
 exports.RULE_CONDITION_RELEASE_COMMIT = "$CI_COMMIT_MESSAGE =~ /^chore\\(release\\).*/";
 exports.RULE_CONDITION_NOT_RELEASE_COMMIT = "$CI_COMMIT_MESSAGE !~ /^chore\\(release\\).*/";
@@ -17,6 +17,11 @@ exports.RULE_NEVER_ON_RELEASE_COMMIT = {
   if: exports.RULE_CONDITION_RELEASE_COMMIT,
   when: "never"
 };
+// currently, we consider all triggered pipelines as agent triggers
+exports.RULE_NEVER_ON_AGENT_TRIGGER = {
+  if: '$CI_PIPELINE_SOURCE  == "trigger"',
+  when: "never"
+};
 exports.RULE_NEVER_ON_SCHEDULE = {
   if: '$CI_PIPELINE_SOURCE  == "schedule"',
   when: "never"
@@ -28,7 +33,7 @@ exports.RULE_IS_TAGGED_RELEASE = {
   if: "$CI_COMMIT_TAG"
 };
 exports.RULE_CONDITION_HOTFIX_BRANCH = "$CI_COMMIT_BRANCH =~ /^[0-9]+.([0-9]+|x).x$/";
-exports.RULES_RELEASE = [exports.RULE_NEVER_ON_RELEASE_COMMIT, exports.RULE_NEVER_ON_SCHEDULE, {
+exports.RULES_RELEASE = [exports.RULE_NEVER_ON_RELEASE_COMMIT, exports.RULE_NEVER_ON_AGENT_TRIGGER, exports.RULE_NEVER_ON_SCHEDULE, {
   if: exports.RULE_CONDITION_MAIN_BRANCH + ' && $AUTO_RELEASE == "true"',
   when: "on_success"
 }, {
@@ -38,7 +43,7 @@ exports.RULES_RELEASE = [exports.RULE_NEVER_ON_RELEASE_COMMIT, exports.RULE_NEVE
   if: exports.RULE_CONDITION_HOTFIX_BRANCH,
   when: "manual"
 }];
-exports.RULES_MANUAL_RELEASE = [exports.RULE_NEVER_ON_RELEASE_COMMIT, exports.RULE_NEVER_ON_SCHEDULE, {
+exports.RULES_MANUAL_RELEASE = [exports.RULE_NEVER_ON_RELEASE_COMMIT, exports.RULE_NEVER_ON_AGENT_TRIGGER, exports.RULE_NEVER_ON_SCHEDULE, {
   if: exports.RULE_CONDITION_MAIN_BRANCH,
   when: "manual"
 }, {