@catladder/pipeline 1.144.0 → 1.145.0

package/dist/bash/BashExpression.d.ts

@@ -0,0 +1,40 @@
+/**
+ * this class represents a string that can be evaluated in bash scripts.
+ *
+ * you can do basic transforms like lowercase, but that does not return you a lowercase string, but instead an experssion represeting a lowercase string
+ */
+export declare class BashExpression {
+  private value;
+  constructor(value: string | BashExpression);
+  toJSON(): string;
+  toString(): string;
+  /**
+   *
+   * @returns a bash expression to lowercase the string
+   */
+  toLowerCase(): BashExpression;
+  /**
+   * concats a value to this one and returns a new BashExpression
+   * @param value
+   * @returns
+   */
+  concat(...values: Array<string | BashExpression>): BashExpression;
+  transformWithCommand(command: string): BashExpression;
+}
+export type StringOrBashExpression = string | BashExpression;
+export declare const getBashVariable: (name: string) => BashExpression;
+/**
+ * joins bash expressions together with a joiner
+ * returns a bash expression if any of the parts is a bash expression
+ * returns a string otherwise
+ *
+ * @param parts
+ * @param joiner
+ * @returns
+ */
+export declare const joinBashExpressions: (parts: Array<StringOrBashExpression>, joiner?: string) => StringOrBashExpression;
+/**
+ * escapes a string or bash expression for bash
+ * it mainly escapes double quotes
+ */
+export declare const bashEscape: (value: StringOrBashExpression | any) => any;

package/dist/bash/BashExpression.js

@@ -0,0 +1,124 @@
+"use strict";
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.bashEscape = exports.joinBashExpressions = exports.getBashVariable = exports.BashExpression = void 0;
+/**
+ * this class represents a string that can be evaluated in bash scripts.
+ *
+ * you can do basic transforms like lowercase, but that does not return you a lowercase string, but instead an experssion represeting a lowercase string
+ */
+var BashExpression = /** @class */function () {
+  function BashExpression(value) {
+    this.value = value;
+  }
+  BashExpression.prototype.toJSON = function () {
+    return this.toString();
+  };
+  BashExpression.prototype.toString = function () {
+    return this.value.toString();
+  };
+  /**
+   *
+   * @returns a bash expression to lowercase the string
+   */
+  BashExpression.prototype.toLowerCase = function () {
+    return this.transformWithCommand("awk '{print tolower($0)}'");
+  };
+  /**
+   * concats a value to this one and returns a new BashExpression
+   * @param value
+   * @returns
+   */
+  BashExpression.prototype.concat = function () {
+    var _a;
+    var values = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+      values[_i] = arguments[_i];
+    }
+    return new BashExpression((_a = this.toString()).concat.apply(_a, __spreadArray([], __read(values.map(function (v) {
+      return v.toString();
+    })), false)));
+  };
+  BashExpression.prototype.transformWithCommand = function (command) {
+    return new BashExpression(
+    // see https://stackoverflow.com/a/2264537
+    "$(printf %s \"".concat(this.toString(), "\" | ").concat(command, ")"));
+  };
+  return BashExpression;
+}();
+exports.BashExpression = BashExpression;
+var getBashVariable = function (name) {
+  return new BashExpression("$".concat(name));
+};
+exports.getBashVariable = getBashVariable;
+/**
+ * joins bash expressions together with a joiner
+ * returns a bash expression if any of the parts is a bash expression
+ * returns a string otherwise
+ *
+ * @param parts
+ * @param joiner
+ * @returns
+ */
+var joinBashExpressions = function (parts, joiner) {
+  if (joiner === void 0) {
+    joiner = "";
+  }
+  var anyIsBashExpression = parts.some(function (p) {
+    return p instanceof BashExpression;
+  });
+  if (anyIsBashExpression) {
+    return new BashExpression(parts.map(function (p) {
+      return p instanceof BashExpression ? p.toString() : p;
+    }).join(joiner));
+  } else {
+    return parts.join(joiner);
+  }
+};
+exports.joinBashExpressions = joinBashExpressions;
+/**
+ * escapes a string or bash expression for bash
+ * it mainly escapes double quotes
+ */
+var bashEscape = function (value) {
+  if (value instanceof BashExpression) {
+    return value.toString(); // no need to escape bash expressions, as we want them to evaluate
+  }
+  // we wrap it in double quotes, so we need to escape them
+  if (typeof value === "string") return value.replace(/"/g, '\\"');
+  return value;
+};
+exports.bashEscape = bashEscape;

package/dist/bash/bashExpressionPerPipelineType.d.ts

@@ -0,0 +1,6 @@
+import type { PipelineType } from "../types/pipeline";
+import type { BashExpression } from "./BashExpression";
+export type BashExpressionPerPipelineType = { [type in PipelineType]?: BashExpression | string } & {
+  default: BashExpression | string;
+};
+export declare const getBashExpressionPerPipelineType: (definition: BashExpressionPerPipelineType, pipelineType?: PipelineType) => string | BashExpression;

package/dist/bash/bashExpressionPerPipelineType.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getBashExpressionPerPipelineType = void 0;
+var getBashExpressionPerPipelineType = function (definition, pipelineType) {
+  if (!pipelineType) return definition.default;
+  return definition[pipelineType] || definition.default;
+};
+exports.getBashExpressionPerPipelineType = getBashExpressionPerPipelineType;

package/dist/bash/bashYaml.d.ts

@@ -0,0 +1,10 @@
+/***
+ * creates a yaml string that can be used in bash scripts
+ * it handles BashExpressions correctly so that they can be evaluated in bash
+ */
+export declare const yamlBashString: (value: any) => string;
+/**
+ * creates a bash script that writes a yaml string to a file
+ * @param value the yaml value to write, it supports BashExpressions
+ */
+export declare const writeBashYamlToFileScript: (value: any, filename: string) => string[];

package/dist/bash/bashYaml.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.writeBashYamlToFileScript = exports.yamlBashString = void 0;
+var yaml_1 = require("yaml");
+var BashExpression_1 = require("./BashExpression");
+var bashExpressionType = {
+  tag: "",
+  resolve: function (str) {
+    // not really needed,but let's make typescript happy
+    return new BashExpression_1.BashExpression(str);
+  },
+  stringify: function (node, ctx) {
+    // we create a BLOCK_LITERAL
+    // but because bash will interpret the value, it may resolve to a multiline string
+    // so we need to indent every line using sed
+    return "|-\n" + node.value.transformWithCommand("sed 's/^/".concat(ctx.indent, "/'"));
+  },
+  identify: function (v) {
+    return v instanceof BashExpression_1.BashExpression;
+  }
+};
+/***
+ * creates a yaml string that can be used in bash scripts
+ * it handles BashExpressions correctly so that they can be evaluated in bash
+ */
+var yamlBashString = function (value) {
+  return (0, yaml_1.stringify)(value, {
+    defaultStringType: "BLOCK_LITERAL",
+    defaultKeyType: "PLAIN",
+    customTags: [bashExpressionType],
+    aliasDuplicateObjects: false,
+    lineWidth: 0
+  });
+};
+exports.yamlBashString = yamlBashString;
+/**
+ * creates a bash script that writes a yaml string to a file
+ * @param value the yaml value to write, it supports BashExpressions
+ */
+var writeBashYamlToFileScript = function (value, filename) {
+  return ["cat > ".concat(filename, " <<EOF\n").concat((0, exports.yamlBashString)(value), "\nEOF\n")];
+};
+exports.writeBashYamlToFileScript = writeBashYamlToFileScript;

package/dist/bash/getInjectVarsScript.d.ts

@@ -0,0 +1,2 @@
+import type { UnspecifiedEnvVars } from "../types";
+export declare const getInjectVarsScript: (vars?: UnspecifiedEnvVars) => string[];

package/dist/bash/getInjectVarsScript.js

@@ -0,0 +1,45 @@
+"use strict";
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getInjectVarsScript = void 0;
+var lodash_1 = require("lodash");
+var BashExpression_1 = require("./BashExpression");
+var getInjectVarsScript = function (vars) {
+  if (!vars) return [];
+  // filter out null and undefined values
+  return Object.entries(vars).filter(function (_a) {
+    var _b = __read(_a, 2),
+      value = _b[1];
+    return !(0, lodash_1.isNil)(value);
+  }).map(function (_a) {
+    var _b = __read(_a, 2),
+      key = _b[0],
+      value = _b[1];
+    return "export ".concat(key, "=\"").concat(value ? (0, BashExpression_1.bashEscape)(value) : "", "\"");
+  });
+};
+exports.getInjectVarsScript = getInjectVarsScript;

package/dist/bash/replaceAsync.d.ts

@@ -0,0 +1,2 @@
+import { BashExpression } from "./BashExpression";
+export default function replaceAsync(string: string | BashExpression, searchValue: any, replacer: (substring: string, ...args: any[]) => Promise<string | BashExpression>): Promise<string | BashExpression>;

package/dist/{pipeline/commitInfo/getCommitInfo.js → bash/replaceAsync.js}

@@ -55,7 +55,7 @@ var __generator = this && this.__generator || function (thisArg, body) {
   }
   function step(op) {
     if (f) throw new TypeError("Generator is already executing.");
-    while (_) try {
+    while (g && (g = 0, op[0] && (_ = 0)), _) try {
       if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
       if (y = 0, t) op = [op[0] & 2, t.value];
       switch (op[0]) {
@@ -115,29 +115,57 @@ var __generator = this && this.__generator || function (thisArg, body) {
     };
   }
 };
-exports.__esModule = true;
-exports.getBaseCommitInfo = void 0;
-var getBuildId_1 = require("./getBuildId");
-var getBaseCommitInfo = function () {
-  return __awaiter(void 0, void 0, void 0, function () {
-    var _a;
-    var _b;
-    return __generator(this, function (_c) {
-      switch (_c.label) {
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var BashExpression_1 = require("./BashExpression");
+// from https://github.com/dsblv/string-replace-async/blob/main/index.js
+// and adjusted a bit
+function replaceAsync(string, searchValue, replacer) {
+  return __awaiter(this, void 0, void 0, function () {
+    var wasBashExpression, values_1, resolvedValues_1, containsBashExpression, result, error_1;
+    return __generator(this, function (_a) {
+      switch (_a.label) {
         case 0:
-          _a = {
-            refName: (_b = process.env.CI_COMMIT_REF_NAME) !== null && _b !== void 0 ? _b : "unknown",
-            reviewSlug: process.env.CI_MERGE_REQUEST_IID ? "mr".concat(process.env.CI_MERGE_REQUEST_IID) : process.env.CI_COMMIT_REF_SLUG ? "hf".concat(process.env.CI_COMMIT_REF_SLUG) : "unknown",
-            buildTime: new Date().toISOString()
-          };
-          return [4 /*yield*/, (0, getBuildId_1.getBuildId)()];
+          wasBashExpression = string instanceof BashExpression_1.BashExpression;
+          _a.label = 1;
         case 1:
-          _a.buildId = _c.sent();
-          return [4 /*yield*/, (0, getBuildId_1.getCurrentVersionString)()];
+          _a.trys.push([1, 3,, 4]);
+          values_1 = [];
+          String.prototype.replace.call(string.toString(), searchValue, function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+              args[_i] = arguments[_i];
+            }
+            // eslint-disable-next-line prefer-spread
+            var result = replacer.apply(undefined, args);
+            values_1.push(result);
+            return "";
+          });
+          return [4 /*yield*/, Promise.all(values_1)];
         case 2:
-          return [2 /*return*/, (_a.currentVersion = _c.sent(), _a)];
+          resolvedValues_1 = _a.sent();
+          containsBashExpression = resolvedValues_1.some(function (value) {
+            return value instanceof BashExpression_1.BashExpression;
+          });
+          result = String.prototype.replace.call(string.toString(), searchValue, function () {
+            var _a, _b;
+            return (_b = (_a = resolvedValues_1.shift()) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : "";
+          });
+          if (wasBashExpression || containsBashExpression) {
+            return [2 /*return*/, new BashExpression_1.BashExpression(result)];
+          } else {
+            return [2 /*return*/, result];
+          }
+          return [3 /*break*/, 4];
+        case 3:
+          error_1 = _a.sent();
+          return [2 /*return*/, Promise.reject(error_1)];
+        case 4:
+          return [2 /*return*/];
       }
     });
   });
-};
-exports.getBaseCommitInfo = getBaseCommitInfo;
+}
+
+exports.default = replaceAsync;

package/dist/build/base/__tests__/createArtifactsConfig.test.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 var createArtifactsConfig_1 = require("../createArtifactsConfig");
 describe("createArtifactsConfig", function () {
   it("returns undefined if no artifacts or artifactsReports", function () {

package/dist/build/base/constants.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.RUNNER_BUILD_RESOURCE_VARIABLES = exports.APP_BUILD_JOB_NAME = void 0;
 exports.APP_BUILD_JOB_NAME = "🔨 app";
 exports.RUNNER_BUILD_RESOURCE_VARIABLES = {

package/dist/build/base/createAppBuildJob.d.ts

@@ -1,8 +1,9 @@
 import type { Context } from "../..";
 import type { CatladderJob } from "../../types/jobs";
-export declare type AppBuildJobDefinition = Partial<CatladderJob>;
+export type AppBuildJobDefinition = Partial<CatladderJob>;
 export declare const createAppBuildJob: (context: Context, {
   script,
   variables,
+  runnerVariables,
   ...def
 }: AppBuildJobDefinition) => CatladderJob;

package/dist/build/base/createAppBuildJob.js

@@ -49,7 +49,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createAppBuildJob = void 0;
 var lodash_1 = require("lodash");
 var path_1 = require("path");
@@ -60,10 +62,11 @@ var constants_1 = require("./constants");
 var writeBuildInfo_1 = require("./writeBuildInfo");
 var writeDotEnv_1 = require("./writeDotEnv");
 var createAppBuildJob = function (context, _a) {
-  var _b, _c, _d, _e;
+  var _b, _c, _d, _e, _f;
   var script = _a.script,
     variables = _a.variables,
-    def = __rest(_a, ["script", "variables"]);
+    runnerVariables = _a.runnerVariables,
+    def = __rest(_a, ["script", "variables", "runnerVariables"]);
   return (0, lodash_1.merge)({
     name: constants_1.APP_BUILD_JOB_NAME,
     envMode: "jobPerEnv",
@@ -71,13 +74,14 @@ var createAppBuildJob = function (context, _a) {
     image: (0, __1.getRunnerImage)("jobs-default"),
     needs: [],
     cache: [],
-    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 : {}),
+    variables: __assign(__assign(__assign(__assign({}, variables !== null && variables !== void 0 ? variables : {}), context.environment.envVars), context.environment.jobOnlyVars.build.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
+    runnerVariables: __assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), runnerVariables !== null && runnerVariables !== void 0 ? runnerVariables : {}), (_c = context.componentConfig.build.runnerVariables) !== null && _c !== void 0 ? _c : {}),
     script: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(context.componentConfig.dotEnv === true // don't build when set to `local`
-    ? (0, writeDotEnv_1.writeDotEnv)(context) : []), false), __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),
+    ? (0, writeDotEnv_1.writeDotEnv)(context) : []), false), __read((0, writeBuildInfo_1.writeBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read((_d = (0, utils_1.ensureArray)(script)) !== null && _d !== void 0 ? _d : []), false),
     artifacts: {
       paths: [(0, path_1.join)(context.componentConfig.dir, "__build_info.json")],
       reports: {
-        junit: (_e = (_d = context.componentConfig.build.artifactsReports) === null || _d === void 0 ? void 0 : _d.junit) === null || _e === void 0 ? void 0 : _e.map(function (p) {
+        junit: (_f = (_e = context.componentConfig.build.artifactsReports) === null || _e === void 0 ? void 0 : _e.junit) === null || _f === void 0 ? void 0 : _f.map(function (p) {
           return (0, path_1.join)(context.componentConfig.dir, p);
         })
       }

package/dist/build/base/createArtifactsConfig.d.ts

@@ -1,4 +1,4 @@
 import type { BuildConfigArtifactsReports } from "../types";
 import type { Artifacts } from "../../types";
 import type { OptionalArtifacts } from "../custom/testJob";
-export declare const createArtifactsConfig: (rootPath: string, artifactsReports?: BuildConfigArtifactsReports | undefined, artifacts?: Artifacts | undefined) => OptionalArtifacts;
+export declare const createArtifactsConfig: (rootPath: string, artifactsReports?: BuildConfigArtifactsReports, artifacts?: Artifacts) => OptionalArtifacts;

package/dist/build/base/createArtifactsConfig.js

@@ -41,7 +41,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createArtifactsConfig = void 0;
 var path_1 = require("path");
 var createArtifactsConfig = function (rootPath, artifactsReports, artifacts) {

package/dist/build/base/index.js

@@ -41,7 +41,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createBuildJobs = void 0;
 var sbom_1 = require("../../deploy/sbom");
 var docker_1 = require("../docker");

package/dist/build/base/writeBuildInfo.js

@@ -1,9 +1,10 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.writeBuildInfo = void 0;
 var writeBuildInfo = function (context) {
-  var _a, _b;
-  return ["echo '{\"id\":\"".concat((_a = context.commitInfo) === null || _a === void 0 ? void 0 : _a.buildId, "\",\"time\":\"").concat((_b = context.commitInfo) === null || _b === void 0 ? void 0 : _b.buildTime, "\"}' > ").concat(context.componentConfig.dir, "/__build_info.json")];
+  return ["echo '{\"id\":\"".concat(context.environment.envVars.BUILD_INFO_BUILD_ID, "\",\"time\":\"").concat(context.environment.envVars.BUILD_INFO_BUILD_TIME, "\"}' > ").concat(context.componentConfig.dir, "/__build_info.json")];
 };
 exports.writeBuildInfo = writeBuildInfo;

package/dist/build/base/writeDotEnv.js

@@ -22,8 +22,11 @@ var __read = this && this.__read || function (o, n) {
   }
   return ar;
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.writeDotEnv = void 0;
+var lodash_1 = require("lodash");
 /**
  * writes a .env file in the components folder
  * @param context
@@ -32,11 +35,17 @@ exports.writeDotEnv = void 0;
 var writeDotEnv = function (context) {
   var envVars = context.environment.envVars;
   // make key=value and sanitize multiline
-  var keyValueString = Object.entries(envVars).map(function (_a) {
+  var keyValueString = Object.entries(envVars)
+  // filter out null and undefined values
+  .filter(function (_a) {
+    var _b = __read(_a, 2),
+      value = _b[1];
+    return !(0, lodash_1.isNil)(value);
+  }).map(function (_a) {
     var _b = __read(_a, 2),
       key = _b[0],
       value = _b[1];
-    return "".concat(key, "=").concat(value.replaceAll("\n", "\\n"));
+    return "".concat(key, "=").concat(value === null || value === void 0 ? void 0 : value.toString().replaceAll("\n", "\\n"));
   }).join("\n");
   return ["cat <<EOF > ".concat(context.componentConfig.dir, "/.env\n").concat(keyValueString, "\nEOF")];
 };

package/dist/build/custom/__tests__/testJob.test.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 var testJob_1 = require("../testJob");
 describe("createCustomTestJobs", function () {
   var componentConfig = {

package/dist/build/custom/buildJob.js

@@ -1,15 +1,5 @@
 "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 +31,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createCustomBuildJobs = void 0;
 var path_1 = require("path");
 var utils_1 = require("../../utils");
@@ -62,7 +54,7 @@ var createCustomBuildJobs = function (context) {
   return (0, base_1.createBuildJobs)(context, {
     appBuild: buildConfig.buildCommand !== null ? {
       image: buildConfig.jobImage,
-      variables: __assign({}, RUNNER_BUILD_VARIABLES),
+      runnerVariables: RUNNER_BUILD_VARIABLES,
       cache: buildConfig.jobCache,
       services: buildConfig.jobServices,
       script: __spreadArray([], __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),

package/dist/build/custom/index.js

@@ -31,7 +31,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createCustomJobs = void 0;
 var buildJob_1 = require("./buildJob");
 var testJob_1 = require("./testJob");

package/dist/build/custom/testJob.d.ts

@@ -2,6 +2,6 @@ import type { Context } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 import type { Artifacts } from "../../types";
 export declare const createCustomTestJobs: (context: Context) => CatladderJob[];
-export declare type OptionalArtifacts = {
+export type OptionalArtifacts = {
   artifacts: Artifacts;
 } | undefined;