@catladder/cli 0.0.0-main-10ef6f7d → 0.0.0-main-d4f1e432

package/dist/bundles/catenv/index.js

@@ -39053,18 +39053,22 @@ var requiresDockerBuild = function (context) {
   return false;
 };
 exports.requiresDockerBuild = requiresDockerBuild;
+var getDockerBaseVariables = function () {
+  return {
+    DOCKER_HOST: "tcp://0.0.0.0:2375",
+    DOCKER_TLS_CERTDIR: "",
+    DOCKER_DRIVER: "overlay2",
+    DOCKER_BUILDKIT: "1"
+  };
+};
 var getDockerBuildVariables = function (context) {
   var _a, _b, _c, _d;
-  return __assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
-    DOCKER_BUILDKIT: "1",
+  return __assign(__assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
     DOCKERFILE_ADDITIONS: (_b = (_a = context.componentConfig.build.docker) === null || _a === void 0 ? void 0 : _a.additionsBegin) === null || _b === void 0 ? void 0 : _b.join("\n"),
     DOCKERFILE_ADDITIONS_END: (_d = (_c = context.componentConfig.build.docker) === null || _c === void 0 ? void 0 : _c.additionsEnd) === null || _d === void 0 ? void 0 : _d.join("\n"),
     APP_DIR: context.componentConfig.dir,
-    DOCKER_HOST: "tcp://0.0.0.0:2375",
-    DOCKER_TLS_CERTDIR: "",
-    DOCKER_DIR: ".",
-    DOCKER_DRIVER: "overlay2"
-  }), (0, exports.getDockerImageVariables)(context));
+    DOCKER_DIR: "."
+  }), getDockerBaseVariables()), (0, exports.getDockerImageVariables)(context));
 };
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
@@ -39075,7 +39079,7 @@ var getDockerJobBaseProps = function (context) {
       name: "docker:20-dind",
       command: ["--tls=false"]
     }],
-    variables: (0, exports.getDockerBuildVariables)(context)
+    variables: getDockerBaseVariables()
   };
 };
 exports.getDockerJobBaseProps = getDockerJobBaseProps;
@@ -39088,7 +39092,9 @@ var createDockerBuildJobBase = function (context, _a) {
     stage: "build"
   }, (0, exports.getDockerJobBaseProps)(context)), {
     script: script || []
-  }), def);
+  }), {
+    variables: (0, exports.getDockerBuildVariables)(context)
+  }, def);
 };
 exports.createDockerBuildJobBase = createDockerBuildJobBase;
 exports.gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
@@ -40106,7 +40112,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-10ef6f7d" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-d4f1e432" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -41168,7 +41174,7 @@ var getBaseDeploymentJob = function (context) {
   return {
     name: exports.DEPLOY_JOB_NAME,
     envMode: "stagePerEnv",
-    needsOtherComponent: context.componentConfig.deploy ? (_c = (_b = context.componentConfig.deploy.waitFor) === null || _b === void 0 ? void 0 : _b.map(function (c) {
+    needs: context.componentConfig.deploy ? (_c = (_b = context.componentConfig.deploy.waitFor) === null || _b === void 0 ? void 0 : _b.map(function (c) {
       return {
         componentName: c,
         job: exports.DEPLOY_JOB_NAME,
@@ -43454,19 +43460,14 @@ var getFullReferencedJobName = function (referencedJobName, componentName, env,
 var replaceReferences = function (job, componentName, env, allRawJobs) {
   var _a, _b, _c;
   var stage = job.envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(env) : job.stage;
-  var needsFromNeeds = (_a = job.needs) === null || _a === void 0 ? void 0 : _a.map(function (n) {
+  var cleanedNeeds = __spreadArray(__spreadArray([], __read((_a = job.needs) !== null && _a !== void 0 ? _a : []), false), __read((_b = job.needsOtherComponent) !== null && _b !== void 0 ? _b : []), false);
+  var needs = cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map(function (n) {
+    var _a;
     return (0, lodash_1.isObject)(n) ? {
-      job: getFullReferencedJobName(n.job, componentName, env, allRawJobs),
+      job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : componentName, env, allRawJobs),
       artifacts: n.artifacts
     } : getFullReferencedJobName(n, componentName, env, allRawJobs);
   });
-  var needsFromOtherComponents = (_b = job.needsOtherComponent) === null || _b === void 0 ? void 0 : _b.map(function (other) {
-    return {
-      artifacts: other.artifacts,
-      job: getFullReferencedJobName(other.job, other.componentName, env, allRawJobs)
-    };
-  });
-  var needs = __spreadArray(__spreadArray([], __read(needsFromNeeds !== null && needsFromNeeds !== void 0 ? needsFromNeeds : []), false), __read(needsFromOtherComponents !== null && needsFromOtherComponents !== void 0 ? needsFromOtherComponents : []), false);
   return __assign(__assign({}, job), {
     stage: stage,
     needs: needs,
@@ -43579,6 +43580,37 @@ var __rest = this && this.__rest || function (s, e) {
   }
   return t;
 };
+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));
+};
 exports.__esModule = true;
 exports.makeGitlabJob = void 0;
 var lodash_1 = __nccwpck_require__(3255);
@@ -43595,9 +43627,9 @@ var makeGitlabJob = function (_a) {
     rest = __rest(_a, ["envMode", "needsStages", "needsOtherComponent", "name", "needs"]);
   return __assign(__assign({}, rest), {
     // sort in a predictable manner for snapshot tests
-    needs: needs === null || needs === void 0 ? void 0 : needs.sort(function (a, b) {
+    needs: needs ? __spreadArray([], __read(needs), false).sort(function (a, b) {
       return getJobName(a).localeCompare(getJobName(b));
-    }),
+    }) : undefined,
     retry: defaults_1.BASE_RETRY,
     interruptible: true
   });

package/dist/bundles/cli/index.js

@@ -350385,18 +350385,22 @@ var requiresDockerBuild = function (context) {
   return false;
 };
 exports.requiresDockerBuild = requiresDockerBuild;
+var getDockerBaseVariables = function () {
+  return {
+    DOCKER_HOST: "tcp://0.0.0.0:2375",
+    DOCKER_TLS_CERTDIR: "",
+    DOCKER_DRIVER: "overlay2",
+    DOCKER_BUILDKIT: "1"
+  };
+};
 var getDockerBuildVariables = function (context) {
   var _a, _b, _c, _d;
-  return __assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
-    DOCKER_BUILDKIT: "1",
+  return __assign(__assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
     DOCKERFILE_ADDITIONS: (_b = (_a = context.componentConfig.build.docker) === null || _a === void 0 ? void 0 : _a.additionsBegin) === null || _b === void 0 ? void 0 : _b.join("\n"),
     DOCKERFILE_ADDITIONS_END: (_d = (_c = context.componentConfig.build.docker) === null || _c === void 0 ? void 0 : _c.additionsEnd) === null || _d === void 0 ? void 0 : _d.join("\n"),
     APP_DIR: context.componentConfig.dir,
-    DOCKER_HOST: "tcp://0.0.0.0:2375",
-    DOCKER_TLS_CERTDIR: "",
-    DOCKER_DIR: ".",
-    DOCKER_DRIVER: "overlay2"
-  }), (0, exports.getDockerImageVariables)(context));
+    DOCKER_DIR: "."
+  }), getDockerBaseVariables()), (0, exports.getDockerImageVariables)(context));
 };
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
@@ -350407,7 +350411,7 @@ var getDockerJobBaseProps = function (context) {
       name: "docker:20-dind",
       command: ["--tls=false"]
     }],
-    variables: (0, exports.getDockerBuildVariables)(context)
+    variables: getDockerBaseVariables()
   };
 };
 exports.getDockerJobBaseProps = getDockerJobBaseProps;
@@ -350420,7 +350424,9 @@ var createDockerBuildJobBase = function (context, _a) {
     stage: "build"
   }, (0, exports.getDockerJobBaseProps)(context)), {
     script: script || []
-  }), def);
+  }), {
+    variables: (0, exports.getDockerBuildVariables)(context)
+  }, def);
 };
 exports.createDockerBuildJobBase = createDockerBuildJobBase;
 exports.gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
@@ -351438,7 +351444,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-10ef6f7d" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-d4f1e432" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -352500,7 +352506,7 @@ var getBaseDeploymentJob = function (context) {
   return {
     name: exports.DEPLOY_JOB_NAME,
     envMode: "stagePerEnv",
-    needsOtherComponent: context.componentConfig.deploy ? (_c = (_b = context.componentConfig.deploy.waitFor) === null || _b === void 0 ? void 0 : _b.map(function (c) {
+    needs: context.componentConfig.deploy ? (_c = (_b = context.componentConfig.deploy.waitFor) === null || _b === void 0 ? void 0 : _b.map(function (c) {
       return {
         componentName: c,
         job: exports.DEPLOY_JOB_NAME,
@@ -354786,19 +354792,14 @@ var getFullReferencedJobName = function (referencedJobName, componentName, env,
 var replaceReferences = function (job, componentName, env, allRawJobs) {
   var _a, _b, _c;
   var stage = job.envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(env) : job.stage;
-  var needsFromNeeds = (_a = job.needs) === null || _a === void 0 ? void 0 : _a.map(function (n) {
+  var cleanedNeeds = __spreadArray(__spreadArray([], __read((_a = job.needs) !== null && _a !== void 0 ? _a : []), false), __read((_b = job.needsOtherComponent) !== null && _b !== void 0 ? _b : []), false);
+  var needs = cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map(function (n) {
+    var _a;
     return (0, lodash_1.isObject)(n) ? {
-      job: getFullReferencedJobName(n.job, componentName, env, allRawJobs),
+      job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : componentName, env, allRawJobs),
       artifacts: n.artifacts
     } : getFullReferencedJobName(n, componentName, env, allRawJobs);
   });
-  var needsFromOtherComponents = (_b = job.needsOtherComponent) === null || _b === void 0 ? void 0 : _b.map(function (other) {
-    return {
-      artifacts: other.artifacts,
-      job: getFullReferencedJobName(other.job, other.componentName, env, allRawJobs)
-    };
-  });
-  var needs = __spreadArray(__spreadArray([], __read(needsFromNeeds !== null && needsFromNeeds !== void 0 ? needsFromNeeds : []), false), __read(needsFromOtherComponents !== null && needsFromOtherComponents !== void 0 ? needsFromOtherComponents : []), false);
   return __assign(__assign({}, job), {
     stage: stage,
     needs: needs,
@@ -354911,6 +354912,37 @@ var __rest = this && this.__rest || function (s, e) {
   }
   return t;
 };
+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));
+};
 exports.__esModule = true;
 exports.makeGitlabJob = void 0;
 var lodash_1 = __nccwpck_require__(23255);
@@ -354927,9 +354959,9 @@ var makeGitlabJob = function (_a) {
     rest = __rest(_a, ["envMode", "needsStages", "needsOtherComponent", "name", "needs"]);
   return __assign(__assign({}, rest), {
     // sort in a predictable manner for snapshot tests
-    needs: needs === null || needs === void 0 ? void 0 : needs.sort(function (a, b) {
+    needs: needs ? __spreadArray([], __read(needs), false).sort(function (a, b) {
       return getJobName(a).localeCompare(getJobName(b));
-    }),
+    }) : undefined,
     retry: defaults_1.BASE_RETRY,
     interruptible: true
   });