@catladder/pipeline 0.0.0-next-c177efda → 0.0.0-next-e3ccf7d4

package/dist/backends/github/GithubBackend.js

@@ -181,6 +181,7 @@ var path_1 = require("path");
 var createAllJobs_1 = require("../../pipeline/createAllJobs");
 var config_1 = require("../../types/config");
 var ciVariables_1 = require("./ciVariables");
+var index_1 = require("../index");
 var createGithubJobs_1 = require("./createGithubJobs");
 var jobImagesPlan_1 = require("../../customImages/jobImagesPlan");
 var scriptFunctions_1 = require("./scriptFunctions");
@@ -290,7 +291,7 @@ var GithubBackend = /** @class */function () {
    */
   GithubBackend.prototype.createWorkflows = function (config_2) {
     return __awaiter(this, arguments, void 0, function (config, images, scripts) {
-      var workflows, reviewStopJobs, manualJobs, _loop_1, this_1, ALL_PIPELINE_TRIGGERS_1, ALL_PIPELINE_TRIGGERS_1_1, trigger, e_1_1;
+      var workflows, workflowEnv, reviewStopJobs, manualJobs, _loop_1, this_1, ALL_PIPELINE_TRIGGERS_1, ALL_PIPELINE_TRIGGERS_1_1, trigger, e_1_1;
       var e_1, _a;
       if (images === void 0) {
         images = this.createImagesPlan(config);
@@ -302,6 +303,7 @@ var GithubBackend = /** @class */function () {
         switch (_b.label) {
           case 0:
             workflows = {};
+            workflowEnv = __assign(__assign({}, ciVariables_1.GITHUB_INJECTED_WORKFLOW_ENV), (0, index_1.getPipelineOptions)(config, this.type).runnerVariables);
             reviewStopJobs = {};
             manualJobs = {};
             _loop_1 = function (trigger) {
@@ -343,7 +345,7 @@ var GithubBackend = /** @class */function () {
                     }
                     if (Object.keys(jobs).length > 0) {
                       workflows["".concat(GENERATED_FILE_PREFIX).concat(workflowFileName(trigger))] = __assign(__assign(__assign({}, TRIGGER_WORKFLOWS[trigger]), workflowPermissions(images)), {
-                        env: ciVariables_1.GITHUB_INJECTED_WORKFLOW_ENV,
+                        env: workflowEnv,
                         jobs: __assign(__assign({}, makeEnsureImageGithubJobs(images)), jobs)
                       });
                     }
@@ -392,7 +394,7 @@ var GithubBackend = /** @class */function () {
                   }
                 }
               }, workflowPermissions(images)), {
-                env: ciVariables_1.GITHUB_INJECTED_WORKFLOW_ENV,
+                env: workflowEnv,
                 jobs: __assign(__assign({}, makeEnsureImageGithubJobs(images)), reviewStopJobs)
               });
             }
@@ -412,7 +414,7 @@ var GithubBackend = /** @class */function () {
                   }
                 }
               }, workflowPermissions(images)), {
-                env: ciVariables_1.GITHUB_INJECTED_WORKFLOW_ENV,
+                env: workflowEnv,
                 jobs: __assign(__assign({}, makeEnsureImageGithubJobs(images)), Object.fromEntries(Object.entries(manualJobs).map(function (_a) {
                   var _b = __read(_a, 2),
                     id = _b[0],

package/dist/backends/github/createGithubJobs.js

@@ -283,6 +283,37 @@ var makeGithubJob = function (context, job, allJobs, uploadProviderIds, images,
   }))), isComponent ? getSecretsEnv(context, secretKinds) : {}), getReferencedSecretsEnv(runScript, secretKinds)), {
     CL_JOB_IMAGE: image !== null && image !== void 0 ? image : "runner"
   });
+  /**
+   * the github environment of the job — serving two purposes:
+   * deployment tracking on deploy jobs, and access to environment
+   * secrets (the repo-level cap of 100 secrets doesn't scale to
+   * multiple envs). Names are keyed by env NAME, never env type: an
+   * app can have several envs of the same type.
+   *
+   * - deploy jobs: `<env>-<component>` — static (unlike the former
+   *   per-PR review names), so environment secrets can attach, and
+   *   each component keeps its own deployment badge/url in the
+   *   github ui. For review, PRs share the component's environment:
+   *   a newer PR's deploy marks the previous one Inactive (the badge,
+   *   not the app) — the price of a static name.
+   * - other jobs referencing secrets join the shared `<env>`
+   *   environment — deliberately NOT the per-component one, whose
+   *   Active deploy badge their deployment records would displace.
+   *   NOTE: build-time and deploy-time vars are not differentiated
+   *   yet, so this environment holds roughly ALL of the env's
+   *   secrets (the build's dotenv references every component).
+   * - jobs without secret references get no environment
+   */
+  var referencesSecrets = Object.values(env).some(function (value) {
+    return typeof value === "string" && (value.includes("${{ secrets.") || value.includes("${{ vars."));
+  });
+  var githubEnvironment = job.environment && isComponent ? __assign({
+    name: "".concat(context.env, "-").concat(context.name)
+  }, createsJobEnv ? {
+    url: "${{ steps.main.outputs.url }}"
+  } : {}) : referencesSecrets ? {
+    name: context.env
+  } : undefined;
   var githubJob = __assign(__assign(__assign(__assign(__assign({
     name: githubJobName(context, job.name),
     "runs-on": "ubuntu-latest"
@@ -301,12 +332,8 @@ var makeGithubJob = function (context, job, allJobs, uploadProviderIds, images,
     } : {})
   } : {}), Object.keys(services).length > 0 ? {
     services: services
-  } : {}), job.environment && isComponent ? {
-    environment: __assign({
-      name: context.environment.envType === "review" ? "review-pr${{ github.event.number }}-".concat(context.name) : "".concat(context.env, "-").concat(context.name)
-    }, createsJobEnv ? {
-      url: "${{ steps.main.outputs.url }}"
-    } : {})
+  } : {}), githubEnvironment ? {
+    environment: githubEnvironment
   } : {}), {
     env: env,
     steps: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(skipCheckout ? [] : [{

package/dist/backends/gitlab/GitlabBackend.js

@@ -174,6 +174,7 @@ var config_1 = require("../../types/config");
 var createAllJobs_1 = require("../../pipeline/createAllJobs");
 var jobImagesPlan_1 = require("../../customImages/jobImagesPlan");
 var shippedCatci_1 = require("../../catci/shippedCatci");
+var index_1 = require("../index");
 var createGitlabJobs_1 = require("./createGitlabJobs");
 var createGitlabPipeline_1 = require("./createGitlabPipeline");
 var gitlabReleaseJobs_1 = require("./gitlabReleaseJobs");
@@ -395,7 +396,7 @@ var GitlabBackend = /** @class */function () {
                   context: null
                 }];
               }))),
-              variables: config.runnerVariables
+              variables: __assign(__assign({}, config.runnerVariables), (0, index_1.getPipelineOptions)(config, this.type).runnerVariables)
             })];
         }
       });

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