@catladder/pipeline 2.0.5 → 2.1.0

package/dist/build/base/writeDotEnv.js

@@ -64,5 +64,4 @@ var componentContextNeedsBuildTimeDotEnv = function (context) {
   var _a;
   return ((_a = context.componentConfig.dotEnv) !== null && _a !== void 0 ? _a : true) === true; // don't build when set to `local`
 };
-
 exports.componentContextNeedsBuildTimeDotEnv = componentContextNeedsBuildTimeDotEnv;

package/dist/build/docker.js

@@ -110,7 +110,6 @@ var getDockerBuildRunnerVariables = function () {
     DOCKER_BUILDKIT: "1" // see https://docs.docker.com/develop/develop-images/build_enhancements/
   };
 };
-
 var getDockerAdditions = function (build) {
   var _a, _b;
   if (!("docker" in build)) return {};

package/dist/build/node/meteor.js

@@ -61,7 +61,6 @@ var createMeteorBuildJobs = function (context) {
       variables: {
         METEOR_DISABLE_OPTIMISTIC_CACHING: "1" // see https://forums.meteor.com/t/veeery-long-building-time-inside-docker-container/58673/17?u=macrozone
       },
-
       script: __spreadArray(__spreadArray([], __read(yarnInstall), false), ['echo "add healthcheck package"', "meteor add panter:healthroute --allow-superuser", "meteor add qualia:prod-shell --allow-superuser", 'TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory', "cp ./__build_info.json ./dist/bundle/programs/server"], false)
     } : undefined,
     dockerBuild: {

package/dist/build/rails/test.js

@@ -73,7 +73,6 @@ var createRailsTestJobs = function (context) {
       files: ["Gemfile.lock"],
       prefix: "$CI_JOB_IMAGE" // a changed image might have different OS libraries which no longer work with the cached gems
     },
-
     paths: [bundlerCacheDir]
   };
   var auditJob = buildConfig.audit !== false ? __assign(__assign({

package/dist/catladder-gitlab.js

@@ -120,8 +120,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 var config_1 = require("./config");
 var generatePipelineFiles_1 = require("./pipeline/generatePipelineFiles");
-var mode = process.argv[2] || "local";
-var config = (0, config_1.readConfig)().then(function (result) {
+(0, config_1.readConfig)().then(function (result) {
   return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
       switch (_a.label) {
@@ -129,7 +128,7 @@ var config = (0, config_1.readConfig)().then(function (result) {
           if (!(result === null || result === void 0 ? void 0 : result.config)) {
             throw new Error("no catladder config found");
           }
-          return [4 /*yield*/, (0, generatePipelineFiles_1.generatePipelineFiles)(result.config, "gitlab", mode)];
+          return [4 /*yield*/, (0, generatePipelineFiles_1.generatePipelineFiles)(result.config, "gitlab")];
         case 1:
           _a.sent();
           return [2 /*return*/];

package/dist/config/readConfig.js

@@ -151,7 +151,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.readConfig = void 0;
 var fs_1 = require("fs");
-// eslint-disable-next-line @typescript-eslint/no-var-requires
 var tsx = require("tsx/cjs/api");
 var yaml_1 = require("yaml");
 // allows us to load ts files

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 = "v2-0-5-d03973d6" || "latest";
+exports.PIPELINE_IMAGE_TAG = "v2-1-0-912a803c" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

package/dist/context/getEnvironmentVariables.js

@@ -246,7 +246,6 @@ var getEnvironmentVariables = function (ctx_1) {
                     }), {
                       shouldResolveReferences: false // we already do this here with replaceAllReferences recursivly until re replaced all
                     })];
-
                   case 1:
                     otherEnvVars = _a.sent().envVars;
                     return [2 /*return*/, otherEnvVars];

package/dist/context/getReviewSlug.js

@@ -18,5 +18,4 @@ var getReviewSlug = function (envConfig, env, pipelineType) {
   }
   return null; // not a review app;
 };
-
 exports.getReviewSlug = getReviewSlug;

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

@@ -39,7 +39,6 @@ var createGoogleCloudRunDeployJobs = function (context) {
       artifacts: {
         paths: [constants_1.ENV_VARS_FILENAME // debug
         ],
-
         when: "always"
       }
     } : {}), {

package/dist/deploy/kubernetes/deployJob.js

@@ -67,7 +67,6 @@ var createKubernetesDeployJobs = function (context) {
     artifacts: {
       paths: [ALL_VALUES_FILE // debug
       ],
-
       when: "always"
     }
   } : {}), {

package/dist/deploy/types/index.d.ts

@@ -11,12 +11,12 @@ export type DeployConfigType = DeployConfig["type"];
 export type DeployConfigGeneric<T extends DeployConfigType> = Extract<DeployConfig, {
   type: T;
 }>;
-export declare const isOfDeployType: <T extends ("custom" | "dockerTag" | "google-cloudrun" | "kubernetes")[]>(t: DeployConfig | false | null | undefined, ...types: T) => t is Extract<DeployConfigCustom, {
+export declare const isOfDeployType: <T extends ("kubernetes" | "custom" | "dockerTag" | "google-cloudrun")[]>(t: DeployConfig | false | null | undefined, ...types: T) => t is Extract<DeployConfigKubernetes, {
   type: T[number];
-}> | Extract<DeployConfigDockerTag, {
+}> | Extract<DeployConfigCustom, {
   type: T[number];
 }> | Extract<DeployConfigCloudRun, {
   type: T[number];
-}> | Extract<DeployConfigKubernetes, {
+}> | Extract<DeployConfigDockerTag, {
   type: T[number];
 }>;

package/dist/pipeline/generatePipelineFiles.d.ts

@@ -1,23 +1,4 @@
-import type { Config, PipelineMode, PipelineType } from "../types";
-export declare function generateChildPipelineContent<T extends PipelineType>(config: Config, pipelineType: T): Promise<{
-  image: string;
-  stages: string[];
-  variables: import("../types/gitlab-ci-yml").JobVariables1 | undefined;
-  workflow: {
-    rules: {
-      if?: string | undefined;
-      changes?: import("../types/gitlab-ci-yml").Changes | undefined;
-      exists?: import("../types/gitlab-ci-yml").Exists | undefined;
-      variables?: import("../types/gitlab-ci-yml").RulesVariables | undefined;
-      when?: import("../types/gitlab-ci-yml").When | undefined;
-      start_in?: string | undefined;
-      allow_failure?: import("../types/gitlab-ci-yml").AllowFailure | undefined;
-      needs?: import("../types/gitlab-ci-yml").RulesNeeds | undefined;
-    }[];
-  } | undefined;
-} & Omit<import("../types").Pipeline<T>, "image" | "jobs" | "variables" | "workflow" | "stages"> & {
-  [k: string]: import("../types").GitlabJobDef;
-}>;
+import type { Config, PipelineType } from "../types";
 export declare function generateLocalPipelineContent<T extends PipelineType>(config: Config, pipelineType: T): Promise<{
   image: string;
   stages: string[];
@@ -34,7 +15,7 @@ export declare function generateLocalPipelineContent<T extends PipelineType>(con
       needs?: import("../types/gitlab-ci-yml").RulesNeeds | undefined;
     }[];
   } | undefined;
-} & Omit<import("../types").Pipeline<T>, "image" | "jobs" | "variables" | "workflow" | "stages"> & {
+} & Omit<import("../types").Pipeline<T>, "image" | "variables" | "workflow" | "stages" | "jobs"> & {
   [k: string]: import("../types").GitlabJobDef;
 }>;
-export declare function generatePipelineFiles<T extends PipelineType>(config: Config, pipelineType: T, mode: PipelineMode<T>): Promise<void>;
+export declare function generatePipelineFiles<T extends PipelineType>(config: Config, pipelineType: T): Promise<void>;

package/dist/pipeline/generatePipelineFiles.js

@@ -158,39 +158,10 @@ var __read = this && this.__read || function (o, n) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.generatePipelineFiles = exports.generateLocalPipelineContent = exports.generateChildPipelineContent = void 0;
+exports.generatePipelineFiles = exports.generateLocalPipelineContent = void 0;
 var writeFiles_1 = require("../utils/writeFiles");
-var createChildPipeline_1 = require("./createChildPipeline");
 var createMainPipeline_1 = require("./createMainPipeline");
-var getPipelineTriggerForGitlabChildPipeline_1 = require("./gitlab/getPipelineTriggerForGitlabChildPipeline");
 var sortGitLabJobDefProps_1 = require("./gitlab/sortGitLabJobDefProps");
-function generateChildPipelineContent(config, pipelineType) {
-  return __awaiter(this, void 0, void 0, function () {
-    var trigger, _a, jobs, image, stages, variables, workflow, pipelineRest, jobsWithSortedProps;
-    return __generator(this, function (_b) {
-      switch (_b.label) {
-        case 0:
-          trigger = (0, getPipelineTriggerForGitlabChildPipeline_1.getPipelineTriggerForGitlabChildPipeline)();
-          return [4 /*yield*/, (0, createChildPipeline_1.createChildPipeline)(pipelineType, trigger, config)];
-        case 1:
-          _a = _b.sent(), jobs = _a.jobs, image = _a.image, stages = _a.stages, variables = _a.variables, workflow = _a.workflow, pipelineRest = __rest(_a, ["jobs", "image", "stages", "variables", "workflow"]);
-          jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(function (_a) {
-            var _b = __read(_a, 2),
-              jobName = _b[0],
-              job = _b[1];
-            return [jobName, (0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job)];
-          }));
-          return [2 /*return*/, __assign(__assign({
-            image: image,
-            stages: stages,
-            variables: variables,
-            workflow: workflow
-          }, pipelineRest), jobsWithSortedProps)];
-      }
-    });
-  });
-}
-exports.generateChildPipelineContent = generateChildPipelineContent;
 function generateLocalPipelineContent(config, pipelineType) {
   return __awaiter(this, void 0, void 0, function () {
     var _a, jobs, image, stages, variables, workflow, pipelineRest, jobsWithSortedProps;
@@ -217,20 +188,14 @@ function generateLocalPipelineContent(config, pipelineType) {
   });
 }
 exports.generateLocalPipelineContent = generateLocalPipelineContent;
-function generatePipelineFiles(config, pipelineType, mode) {
+function generatePipelineFiles(config, pipelineType) {
   return __awaiter(this, void 0, void 0, function () {
-    var pipelineContent_1, pipelineContent;
+    var pipelineContent;
     return __generator(this, function (_a) {
       switch (_a.label) {
         case 0:
-          if (!(mode === "childpipeline")) return [3 /*break*/, 2];
-          return [4 /*yield*/, generateChildPipelineContent(config, pipelineType)];
-        case 1:
-          pipelineContent_1 = _a.sent();
-          return [2 /*return*/, (0, writeFiles_1.writeYamlfile)("__pipeline.yml", pipelineContent_1)];
-        case 2:
           return [4 /*yield*/, generateLocalPipelineContent(config, pipelineType)];
-        case 3:
+        case 1:
           pipelineContent = _a.sent();
           return [2 /*return*/, (0, writeFiles_1.writeYamlfile)(".gitlab-ci.yml", pipelineContent)];
       }

package/dist/pipeline/gitlab/gitlabReleaseJobs.d.ts

@@ -3,7 +3,6 @@ export declare const getGitlabReleaseJobs: () => {
     stage: string;
     image: string;
     script: string[];
-    after_script: string[];
     rules: {
       if?: string | undefined;
       changes?: import("../../types/gitlab-ci-yml").Changes | undefined;
@@ -19,7 +18,6 @@ export declare const getGitlabReleaseJobs: () => {
     stage: string;
     image: string;
     script: string[];
-    after_script: string[];
     needs: never[];
     rules: {
       if?: string | undefined;

package/dist/pipeline/gitlab/gitlabReleaseJobs.js

@@ -12,14 +12,12 @@ var getGitlabReleaseJobs = function () {
   return _a = {}, _a["create release"] = {
     stage: "release",
     image: (0, runner_1.getRunnerImage)("semantic-release"),
-    script: ["semanticRelease"],
-    after_script: [EXPIRED_TOKEN_HELP],
+    script: ["semanticRelease", EXPIRED_TOKEN_HELP],
     rules: rules_1.RULES_RELEASE
   }, _a["⚠️ force create release"] = {
     stage: "release",
     image: (0, runner_1.getRunnerImage)("semantic-release"),
-    script: ["semanticRelease"],
-    after_script: [EXPIRED_TOKEN_HELP],
+    script: ["semanticRelease", EXPIRED_TOKEN_HELP],
     needs: [],
     rules: rules_1.RULES_MANUAL_RELEASE
   }, _a;

package/dist/pipeline/index.d.ts

@@ -1,4 +1,3 @@
-export * from "./createChildPipeline";
 export * from "./createJobsForComponent";
 export * from "./generatePipelineFiles";
 export * from "./gitlab/gitlabReleaseJobs";

package/dist/pipeline/index.js

@@ -22,7 +22,6 @@ var __exportStar = this && this.__exportStar || function (m, exports) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-__exportStar(require("./createChildPipeline"), exports);
 __exportStar(require("./createJobsForComponent"), exports);
 __exportStar(require("./generatePipelineFiles"), exports);
 __exportStar(require("./gitlab/gitlabReleaseJobs"), exports);