@catladder/pipeline 0.0.0-next-12d216ae → 0.0.0-next-e9e5af68

package/dist/backends/github/GithubBackend.js

@@ -295,25 +295,29 @@ var GithubBackend = /** @class */function () {
    */
   GithubBackend.prototype.createWorkflows = function (config_2) {
     return __awaiter(this, arguments, void 0, function (config, images, scripts) {
-      var workflows, workflowEnv, reviewStopJobs, manualJobs, _loop_1, this_1, ALL_PIPELINE_TRIGGERS_1, ALL_PIPELINE_TRIGGERS_1_1, trigger, e_1_1;
+      var workflows, workflowEnv, reviewStopJobs, manualJobs, manualJobConditions, manualDispatchOptions, _loop_1, this_1, ALL_PIPELINE_TRIGGERS_1, ALL_PIPELINE_TRIGGERS_1_1, trigger, e_1_1;
       var e_1, _a;
+      var _b, _c, _d, _e;
       if (images === void 0) {
         images = this.createImagesPlan(config);
       }
       if (scripts === void 0) {
         scripts = new scriptFiles_1.GithubScriptFiles();
       }
-      return __generator(this, function (_b) {
-        switch (_b.label) {
+      return __generator(this, function (_f) {
+        switch (_f.label) {
           case 0:
             workflows = {};
             workflowEnv = __assign(__assign({}, ciVariables_1.GITHUB_INJECTED_WORKFLOW_ENV), (0, index_1.getPipelineOptions)(config, this.type).runnerVariables);
             reviewStopJobs = {};
             manualJobs = {};
+            manualJobConditions = {};
+            manualDispatchOptions = [];
             _loop_1 = function (trigger) {
-              var allJobs, uploadProviderIds, secretKinds, jobs, releaseJobs;
-              return __generator(this, function (_c) {
-                switch (_c.label) {
+              var allJobs, uploadProviderIds, secretKinds, triggerJobs, _g, _h, _j, id, _k, githubJob, job, context, leafIds, dependents, triggerJobs_1, triggerJobs_1_1, _l, id, githubJob, _m, _o, need, list, servesLeaves, leafIds_1, leafIds_1_1, leaf, stack, cur, leaves, _p, _q, need, _r, _s, dependent, jobs, triggerJobs_2, triggerJobs_2_1, _t, id, githubJob, leaves, releaseJobs, _u, _v, _w, id, job;
+              var e_2, _x, e_3, _y, e_4, _z, e_5, _0, e_6, _1, e_7, _2, e_8, _3, e_9, _4;
+              return __generator(this, function (_5) {
+                switch (_5.label) {
                   case 0:
                     return [4 /*yield*/, (0, createAllJobs_1.createAllJobs)({
                       config: config,
@@ -321,11 +325,10 @@ var GithubBackend = /** @class */function () {
                       pipelineType: this_1.type
                     })];
                   case 1:
-                    allJobs = _c.sent();
+                    allJobs = _5.sent();
                     uploadProviderIds = (0, createGithubJobs_1.getUploadProviderIds)(allJobs);
                     secretKinds = (0, createGithubJobs_1.collectSecretKinds)(allJobs);
-                    jobs = {};
-                    // NOTE: agent jobs are gitlab-only and skipped on github
+                    triggerJobs = new Map();
                     __spreadArray(__spreadArray([], __read(allJobs.workspaces), false), __read(allJobs.components), false).forEach(function (_a) {
                       var context = _a.context,
                         contextJobs = _a.jobs;
@@ -333,19 +336,182 @@ var GithubBackend = /** @class */function () {
                         var _a = __read((0, createGithubJobs_1.makeGithubJob)(context, job, allJobs, uploadProviderIds, images, scripts, secretKinds), 2),
                           id = _a[0],
                           githubJob = _a[1];
+                        triggerJobs.set(id, {
+                          githubJob: githubJob,
+                          job: job,
+                          context: context
+                        });
+                      });
+                    });
+                    try {
+                      // review-stop jobs run in their own on:pull_request:closed workflow
+                      for (_g = (e_2 = void 0, __values(__spreadArray([], __read(triggerJobs), false))), _h = _g.next(); !_h.done; _h = _g.next()) {
+                        _j = __read(_h.value, 2), id = _j[0], _k = _j[1], githubJob = _k.githubJob, job = _k.job, context = _k.context;
                         if (isReviewStopJob(context, job)) {
                           reviewStopJobs[id] = githubJob;
-                        } else if (isManualTaskJob(job)) {
+                          triggerJobs.delete(id);
+                        }
+                      }
+                    } catch (e_2_1) {
+                      e_2 = {
+                        error: e_2_1
+                      };
+                    } finally {
+                      try {
+                        if (_h && !_h.done && (_x = _g.return)) _x.call(_g);
+                      } finally {
+                        if (e_2) throw e_2.error;
+                      }
+                    }
+                    leafIds = __spreadArray([], __read(triggerJobs), false).filter(function (_a) {
+                      var _b = __read(_a, 2),
+                        job = _b[1].job;
+                      return job.gate === "manual" || isManualTaskJob(job);
+                    }).map(function (_a) {
+                      var _b = __read(_a, 1),
+                        id = _b[0];
+                      return id;
+                    });
+                    dependents = new Map();
+                    try {
+                      for (triggerJobs_1 = (e_3 = void 0, __values(triggerJobs)), triggerJobs_1_1 = triggerJobs_1.next(); !triggerJobs_1_1.done; triggerJobs_1_1 = triggerJobs_1.next()) {
+                        _l = __read(triggerJobs_1_1.value, 2), id = _l[0], githubJob = _l[1].githubJob;
+                        try {
+                          for (_m = (e_4 = void 0, __values((_b = githubJob.needs) !== null && _b !== void 0 ? _b : [])), _o = _m.next(); !_o.done; _o = _m.next()) {
+                            need = _o.value;
+                            if (!triggerJobs.has(need)) continue;
+                            list = dependents.get(need);
+                            if (list) list.push(id);else dependents.set(need, [id]);
+                          }
+                        } catch (e_4_1) {
+                          e_4 = {
+                            error: e_4_1
+                          };
+                        } finally {
+                          try {
+                            if (_o && !_o.done && (_z = _m.return)) _z.call(_m);
+                          } finally {
+                            if (e_4) throw e_4.error;
+                          }
+                        }
+                      }
+                    } catch (e_3_1) {
+                      e_3 = {
+                        error: e_3_1
+                      };
+                    } finally {
+                      try {
+                        if (triggerJobs_1_1 && !triggerJobs_1_1.done && (_y = triggerJobs_1.return)) _y.call(triggerJobs_1);
+                      } finally {
+                        if (e_3) throw e_3.error;
+                      }
+                    }
+                    servesLeaves = new Map();
+                    try {
+                      for (leafIds_1 = (e_5 = void 0, __values(leafIds)), leafIds_1_1 = leafIds_1.next(); !leafIds_1_1.done; leafIds_1_1 = leafIds_1.next()) {
+                        leaf = leafIds_1_1.value;
+                        stack = [leaf];
+                        cur = void 0;
+                        while ((cur = stack.pop()) !== undefined) {
+                          leaves = servesLeaves.get(cur);
+                          if (leaves === null || leaves === void 0 ? void 0 : leaves.has(leaf)) continue; // already walked for this leaf
+                          if (!leaves) {
+                            leaves = new Set();
+                            servesLeaves.set(cur, leaves);
+                          }
+                          leaves.add(leaf);
+                          try {
+                            for (_p = (e_6 = void 0, __values((_d = (_c = triggerJobs.get(cur)) === null || _c === void 0 ? void 0 : _c.githubJob.needs) !== null && _d !== void 0 ? _d : [])), _q = _p.next(); !_q.done; _q = _p.next()) {
+                              need = _q.value;
+                              if (triggerJobs.has(need)) stack.push(need); // upstream deps
+                            }
+                          } catch (e_6_1) {
+                            e_6 = {
+                              error: e_6_1
+                            };
+                          } finally {
+                            try {
+                              if (_q && !_q.done && (_1 = _p.return)) _1.call(_p);
+                            } finally {
+                              if (e_6) throw e_6.error;
+                            }
+                          }
+                          try {
+                            for (_r = (e_7 = void 0, __values((_e = dependents.get(cur)) !== null && _e !== void 0 ? _e : [])), _s = _r.next(); !_s.done; _s = _r.next()) {
+                              dependent = _s.value;
+                              stack.push(dependent); // downstream consumers
+                            }
+                          } catch (e_7_1) {
+                            e_7 = {
+                              error: e_7_1
+                            };
+                          } finally {
+                            try {
+                              if (_s && !_s.done && (_2 = _r.return)) _2.call(_r);
+                            } finally {
+                              if (e_7) throw e_7.error;
+                            }
+                          }
+                        }
+                      }
+                    } catch (e_5_1) {
+                      e_5 = {
+                        error: e_5_1
+                      };
+                    } finally {
+                      try {
+                        if (leafIds_1_1 && !leafIds_1_1.done && (_0 = leafIds_1.return)) _0.call(leafIds_1);
+                      } finally {
+                        if (e_5) throw e_5.error;
+                      }
+                    }
+                    jobs = {};
+                    try {
+                      for (triggerJobs_2 = (e_8 = void 0, __values(triggerJobs)), triggerJobs_2_1 = triggerJobs_2.next(); !triggerJobs_2_1.done; triggerJobs_2_1 = triggerJobs_2.next()) {
+                        _t = __read(triggerJobs_2_1.value, 2), id = _t[0], githubJob = _t[1].githubJob;
+                        leaves = servesLeaves.get(id);
+                        if (leaves) {
                           manualJobs[id] = githubJob;
+                          manualJobConditions[id] = __spreadArray([], __read(leaves), false).sort().map(function (leaf) {
+                            return "inputs.job == '".concat(leaf, "'");
+                          }).join(" || ");
                         } else {
                           jobs[id] = githubJob;
                         }
-                      });
-                    });
+                      }
+                    } catch (e_8_1) {
+                      e_8 = {
+                        error: e_8_1
+                      };
+                    } finally {
+                      try {
+                        if (triggerJobs_2_1 && !triggerJobs_2_1.done && (_3 = triggerJobs_2.return)) _3.call(triggerJobs_2);
+                      } finally {
+                        if (e_8) throw e_8.error;
+                      }
+                    }
+                    manualDispatchOptions.push.apply(manualDispatchOptions, __spreadArray([], __read(leafIds), false));
                     if (trigger === "mainBranch") {
                       releaseJobs = (0, githubReleaseJobs_1.getGithubReleaseJobs)(config, Object.keys(jobs), images);
                       Object.assign(jobs, releaseJobs.main);
-                      Object.assign(manualJobs, releaseJobs.manual);
+                      try {
+                        for (_u = (e_9 = void 0, __values(Object.entries(releaseJobs.manual))), _v = _u.next(); !_v.done; _v = _u.next()) {
+                          _w = __read(_v.value, 2), id = _w[0], job = _w[1];
+                          manualJobs[id] = job;
+                          manualJobConditions[id] = "inputs.job == '".concat(id, "'");
+                          manualDispatchOptions.push(id);
+                        }
+                      } catch (e_9_1) {
+                        e_9 = {
+                          error: e_9_1
+                        };
+                      } finally {
+                        try {
+                          if (_v && !_v.done && (_4 = _u.return)) _4.call(_u);
+                        } finally {
+                          if (e_9) throw e_9.error;
+                        }
+                      }
                     }
                     if (Object.keys(jobs).length > 0) {
                       workflows["".concat(GENERATED_FILE_PREFIX).concat(workflowFileName(trigger))] = __assign(__assign(__assign({}, TRIGGER_WORKFLOWS[trigger]), workflowPermissions(images)), {
@@ -358,25 +524,25 @@ var GithubBackend = /** @class */function () {
               });
             };
             this_1 = this;
-            _b.label = 1;
+            _f.label = 1;
           case 1:
-            _b.trys.push([1, 6, 7, 8]);
+            _f.trys.push([1, 6, 7, 8]);
             ALL_PIPELINE_TRIGGERS_1 = __values(config_1.ALL_PIPELINE_TRIGGERS), ALL_PIPELINE_TRIGGERS_1_1 = ALL_PIPELINE_TRIGGERS_1.next();
-            _b.label = 2;
+            _f.label = 2;
           case 2:
             if (!!ALL_PIPELINE_TRIGGERS_1_1.done) return [3 /*break*/, 5];
             trigger = ALL_PIPELINE_TRIGGERS_1_1.value;
             return [5 /*yield**/, _loop_1(trigger)];
           case 3:
-            _b.sent();
-            _b.label = 4;
+            _f.sent();
+            _f.label = 4;
           case 4:
             ALL_PIPELINE_TRIGGERS_1_1 = ALL_PIPELINE_TRIGGERS_1.next();
             return [3 /*break*/, 2];
           case 5:
             return [3 /*break*/, 8];
           case 6:
-            e_1_1 = _b.sent();
+            e_1_1 = _f.sent();
             e_1 = {
               error: e_1_1
             };
@@ -412,7 +578,7 @@ var GithubBackend = /** @class */function () {
                         description: "the task to run",
                         required: true,
                         type: "choice",
-                        options: Object.keys(manualJobs)
+                        options: __spreadArray([], __read(new Set(manualDispatchOptions)), false)
                       }
                     }
                   }
@@ -424,7 +590,7 @@ var GithubBackend = /** @class */function () {
                     id = _b[0],
                     job = _b[1];
                   return [id, __assign(__assign({}, job), {
-                    if: "${{ inputs.job == '".concat(id, "' }}")
+                    if: "${{ ".concat(manualJobConditions[id], " }}")
                   })];
                 })))
               });

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 = "next-12d216ae" || "latest";
+exports.PIPELINE_IMAGE_TAG = "next-e9e5af68" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

package/dist/customImages/shippedImages.js

@@ -36,7 +36,6 @@ exports.RUNNER_IMAGE_BUILD_CONTEXT = {
   "jobs-testing-chrome": "root",
   kubernetes: "self",
   "docker-build": "self",
-  gcloud: "self",
   "semantic-release": "self",
   changesets: "self",
   "agent-claude": "self"

package/dist/deploy/cloudRun/createJobs/constants.d.ts

@@ -1 +1,11 @@
-export declare const ENV_VARS_FILENAME = "____envvars.yaml";
+export declare const ENV_VARS_FILENAME = "____envvars.yaml";
+/**
+ * the official google cloud sdk image used by cloud run deploy/stop jobs.
+ * Referenced directly (not a repo-built catladder image) because our
+ * former `gcloud` image was just `FROM google/cloud-sdk:latest` and added
+ * nothing — so there is no reason to ship/build it. Pinned to match the
+ * gcloud SDK version baked into the `docker-build` image
+ * (runner-images/docker-build/Dockerfile: GCLOUD_SDK_VERSION); bump both
+ * together.
+ */
+export declare const CLOUD_SDK_IMAGE = "google/cloud-sdk:525.0.0";

package/dist/deploy/cloudRun/createJobs/constants.js

@@ -3,5 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ENV_VARS_FILENAME = void 0;
-exports.ENV_VARS_FILENAME = "____envvars.yaml";
+exports.CLOUD_SDK_IMAGE = exports.ENV_VARS_FILENAME = void 0;
+exports.ENV_VARS_FILENAME = "____envvars.yaml";
+/**
+ * the official google cloud sdk image used by cloud run deploy/stop jobs.
+ * Referenced directly (not a repo-built catladder image) because our
+ * former `gcloud` image was just `FROM google/cloud-sdk:latest` and added
+ * nothing — so there is no reason to ship/build it. Pinned to match the
+ * gcloud SDK version baked into the `docker-build` image
+ * (runner-images/docker-build/Dockerfile: GCLOUD_SDK_VERSION); bump both
+ * together.
+ */
+exports.CLOUD_SDK_IMAGE = "google/cloud-sdk:525.0.0";

package/dist/deploy/cloudRun/createJobs/index.js

@@ -14,7 +14,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createGoogleCloudRunDeployJobs = void 0;
-var runner_1 = require("../../../runner");
 var gitlab_1 = require("../../../utils/gitlab");
 var base_1 = require("../../base");
 var types_1 = require("../../types");
@@ -42,11 +41,11 @@ var createGoogleCloudRunDeployJobs = function (context) {
         when: "always"
       }
     } : {}), {
-      image: (0, runner_1.getRunnerImage)("gcloud"),
+      image: constants_1.CLOUD_SDK_IMAGE,
       script: deployScripts
     }),
     stop: {
-      image: (0, runner_1.getRunnerImage)("gcloud"),
+      image: constants_1.CLOUD_SDK_IMAGE,
       variables: {
         CLOUDSDK_CORE_DISABLE_PROMPTS: "1"
       },

package/dist/runner/index.d.ts

@@ -1,4 +1,4 @@
-export type RunnerImageName = "jobs-default" | "jobs-meteor" | "jobs-testing-chrome" | "kubernetes" | "docker-build" | "gcloud" | "semantic-release" | "changesets" | "agent-claude";
+export type RunnerImageName = "jobs-default" | "jobs-meteor" | "jobs-testing-chrome" | "kubernetes" | "docker-build" | "semantic-release" | "changesets" | "agent-claude";
 /**
  * a reference to a catladder-provided job image. It is resolved by the
  * pipeline backend according to the `jobImages` mode: