@catladder/pipeline 1.101.3 → 1.102.0

package/dist/build/base/createBuildJob.js

@@ -70,7 +70,7 @@ var createBuildJob = function (context, _a) {
     image: (0, __1.getRunnerImage)("jobs-default"),
     needs: [],
     cache: [],
-    variables: __assign(__assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), variables !== null && variables !== void 0 ? variables : {}), context.environment.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
+    variables: __assign(__assign(__assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), variables !== null && variables !== void 0 ? variables : {}), context.environment.envVars), context.environment.jobOnlyVars.build.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
     script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, writeBuildInfo_1.writeBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read((_c = (0, utils_1.ensureArray)(script)) !== null && _c !== void 0 ? _c : []), false),
     artifacts: {
       paths: [(0, path_1.join)(context.componentConfig.dir, "__build_info.json")],

package/dist/build/custom/testJob.js

@@ -63,9 +63,9 @@ var createCustomTestJobs = function (context) {
     throw new Error("deploy config is not custom");
   }
   var base = {
-    variables: __assign(__assign({
+    variables: __assign(__assign(__assign({
       APP_PATH: context.componentConfig.dir
-    }, RUNNER_CUSTOM_TEST_VARIABLES), (_b = buildConfig.extraVars) !== null && _b !== void 0 ? _b : {}),
+    }, RUNNER_CUSTOM_TEST_VARIABLES), context.environment.jobOnlyVars.build.envVars), (_b = buildConfig.extraVars) !== null && _b !== void 0 ? _b : {}),
     services: buildConfig.jobServices,
     cache: buildConfig.jobCache,
     stage: "test",

package/dist/build/node/testJob.js

@@ -56,9 +56,9 @@ var createNodeTestJobs = function (context) {
   }
   var buildConfig = context.componentConfig.build;
   var base = {
-    variables: __assign(__assign({
+    variables: __assign(__assign(__assign({
       APP_PATH: context.componentConfig.dir
-    }, constants_1.NODE_RUNNER_BUILD_VARIABLES), (_b = buildConfig.extraVars) !== null && _b !== void 0 ? _b : {}),
+    }, constants_1.NODE_RUNNER_BUILD_VARIABLES), context.environment.jobOnlyVars.build.envVars), (_b = buildConfig.extraVars) !== null && _b !== void 0 ? _b : {}),
     stage: "test",
     needs: [],
     envMode: "none"

package/dist/build/rails/build.js

@@ -1,5 +1,15 @@
 "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);
+};
 var __read = this && this.__read || function (o, n) {
   var m = typeof Symbol === "function" && o[Symbol.iterator];
   if (!m) return o;
@@ -41,7 +51,7 @@ var createRailsBuildJobs = function (context) {
     return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
   }).join(" ");
   return [(0, docker_1.createDockerBuildJobBase)(context, {
-    variables: context.componentConfig.build.extraVars,
+    variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.componentConfig.build.extraVars),
     // custom script
     script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
     //  replace private git ssh gem sources with https to make bundler with credentials via env var work

package/dist/build/rails/test.js

@@ -52,7 +52,7 @@ var createRailsTestJobs = function (context) {
   }
   var buildConfig = context.componentConfig.build;
   var base = {
-    variables: (_b = buildConfig.extraVars) !== null && _b !== void 0 ? _b : {},
+    variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), (_b = buildConfig.extraVars) !== null && _b !== void 0 ? _b : {}),
     stage: "test",
     needs: [],
     envMode: "none"

package/dist/build/types.d.ts

@@ -1,4 +1,4 @@
-import type { GitlabJobImage, GitlabJobService } from "../types";
+import type { EnvVars, GitlabJobImage, GitlabJobService } from "../types";
 import type { CatladderJob } from "../types/jobs";
 export declare type BuildConfigArtifactsReports = {
   /**
@@ -14,8 +14,15 @@ export declare type BuildConfigBase = {
    * command to run on the image to start the app (e.g. yarn start)
    */
   startCommand?: string;
+  /**
+   * vars that only exist in the build jobs.
+   * Can curently not reference other variables from other components
+   */
+  jobVars?: EnvVars;
   /**
    * additional env vars for the buid jobs
+   *
+   * @deprecated use jobVars
    */
   extraVars?: Record<string, string>;
   /**