@catladder/cli 0.0.0-main-4c899109 → 0.0.0-main-3df5566d

package/dist/bundles/catenv/index.js

@@ -5468,7 +5468,7 @@ const createMainPipeline = async (pipelineType, config) => {
         // for all triggers create jobs and add base rules
         const allJobsPerTrigger = await Promise.all(config_1.ALL_PIPELINE_TRIGGERS.map(async (trigger) => await (0, createGitlabJobs_1.createGitlabJobs)(await (0, createAllJobs_1.createAllJobs)({ config, trigger, pipelineType }), getGitlabRulesForTrigger(trigger)))).then((j) => j.flat());
         const allWorkspaceJobs = allJobsPerTrigger
-            .filter((j) => j.context.type === "workspace") // sort by componentName in the same order as they appear in the config
+            .filter((j) => { var _a; return ((_a = j.context) === null || _a === void 0 ? void 0 : _a.type) === "workspace"; }) // sort by componentName in the same order as they appear in the config
             // this is purely for better readability in git diffs when you add new components
             .sort((a, b) => {
             var _a;
@@ -5478,7 +5478,7 @@ const createMainPipeline = async (pipelineType, config) => {
             return aIndex - bIndex;
         });
         const allComponentJobs = allJobsPerTrigger
-            .filter((j) => j.context.type === "component")
+            .filter((j) => { var _a; return ((_a = j.context) === null || _a === void 0 ? void 0 : _a.type) === "component"; })
             // sort by componentName in the same order as they appear in the config
             // this is purely for better readability in git diffs when you add new components
             .sort((a, b) => {
@@ -5487,18 +5487,18 @@ const createMainPipeline = async (pipelineType, config) => {
             const bIndex = componentNames.findIndex((c) => c === b.context.name);
             return aIndex - bIndex;
         });
-        const allJobs = [...allWorkspaceJobs, ...allComponentJobs].reduce((acc, { gitlabJob, name }) => {
+        const allJobs = [...allWorkspaceJobs, ...allComponentJobs].reduce((acc, { gitlabJob, name, context }) => {
             var _a, _b;
             // merge jobs, if a job is already there, merge the rules
             // this is currently needed because of envMode: "none", which creates the same job for all triggers, so it can appear multiple times
             if (acc[name]) {
-                acc[name].rules = [
-                    ...((_a = acc[name].rules) !== null && _a !== void 0 ? _a : []),
+                acc[name].gitlabJob.rules = [
+                    ...((_a = acc[name].gitlabJob.rules) !== null && _a !== void 0 ? _a : []),
                     ...((_b = gitlabJob.rules) !== null && _b !== void 0 ? _b : []),
                 ];
             }
             else {
-                acc[name] = gitlabJob;
+                acc[name] = { context, gitlabJob };
             }
             return acc;
         }, {});
@@ -5506,7 +5506,13 @@ const createMainPipeline = async (pipelineType, config) => {
             stages: [...stages, "release"],
             jobs: {
                 ...allJobs,
-                ...(0, gitlabReleaseJobs_1.getGitlabReleaseJobs)(),
+                ...Object.fromEntries(Object.entries((0, gitlabReleaseJobs_1.getGitlabReleaseJobs)()).map(([name, gitlabJob]) => [
+                    name,
+                    {
+                        gitlabJob,
+                        context: null,
+                    },
+                ])),
             },
             variables: config.runnerVariables,
         });
@@ -5537,32 +5543,83 @@ function getGitlabRulesForTrigger(trigger) {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.generatePipelineFiles = exports.generateLocalPipelineContent = void 0;
+exports.getGitlabCompletePipeline = exports.generatePipelineFiles = void 0;
+const promises_1 = __nccwpck_require__(3292);
+const path_1 = __nccwpck_require__(1017);
 const writeFiles_1 = __nccwpck_require__(2228);
 const createMainPipeline_1 = __nccwpck_require__(9192);
 const sortGitLabJobDefProps_1 = __nccwpck_require__(2361);
-async function generateLocalPipelineContent(config, pipelineType) {
-    const { jobs, image, stages, variables, workflow, ...pipelineRest } = await (0, createMainPipeline_1.createMainPipeline)(pipelineType, config);
-    const jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(([jobName, job]) => [
-        jobName,
-        (0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
-    ]));
-    return {
-        image,
-        stages,
-        variables,
-        workflow,
-        ...pipelineRest,
-        // jobs need to be spread into main YAML, because GitLab pipeline YAML has no jobs key - jobs are top level with their key as their name
-        ...jobsWithSortedProps,
-    };
-}
-exports.generateLocalPipelineContent = generateLocalPipelineContent;
+const CATLADDER_GENERATED_FOLDER = ".catladder-generated";
+const GITLAB_GENERATED_FOLDER = CATLADDER_GENERATED_FOLDER + "/gitlab";
 async function generatePipelineFiles(config, pipelineType) {
-    const pipelineContent = await generateLocalPipelineContent(config, pipelineType);
-    return (0, writeFiles_1.writeYamlfile)(`.gitlab-ci.yml`, pipelineContent);
+    if (pipelineType !== "gitlab") {
+        throw new Error("Pipeline type not supported");
+    }
+    const includes = await getGitlabPipelineIncludes(config);
+    const mainFile = {
+        path: ".gitlab-ci.yml",
+        content: {
+            include: includes.map((i) => i.path),
+        },
+    };
+    const files = [mainFile, ...includes];
+    // first clean up the folder
+    await (0, promises_1.rm)(GITLAB_GENERATED_FOLDER, { recursive: true });
+    // write files
+    await Promise.all(files.map(async ({ path, content }) => {
+        await (0, promises_1.mkdir)((0, path_1.dirname)(path), { recursive: true });
+        await (0, writeFiles_1.writeYamlfile)(path, content);
+    }));
 }
 exports.generatePipelineFiles = generatePipelineFiles;
+async function getGitlabPipelineIncludes(config) {
+    const { jobs, image, stages, variables, workflow, ...pipelineRest } = await (0, createMainPipeline_1.createMainPipeline)("gitlab", config);
+    // we will create 1 include per component or workspace
+    // this is for better readability in git diffs and to avoid problems with yaml files beeing too large
+    // group by context
+    const groups = Object.entries(jobs).reduce((acc, [jobName, { gitlabJob, context }]) => {
+        const group = !context
+            ? "global-jobs"
+            : (context === null || context === void 0 ? void 0 : context.type) + "/" + context.name;
+        if (!acc[group]) {
+            acc[group] = {};
+        }
+        acc[group][jobName] = (0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(gitlabJob); // also sort properties for more consistent diffing
+        return acc;
+    }, {});
+    const componentIncludes = Object.entries(groups).map(([group, jobs]) => {
+        return {
+            path: GITLAB_GENERATED_FOLDER + "/" + group + ".yaml",
+            content: jobs,
+        };
+    });
+    const mainInclude = {
+        path: GITLAB_GENERATED_FOLDER + "/main.yaml",
+        content: {
+            image,
+            stages,
+            variables,
+            workflow,
+            ...pipelineRest,
+        },
+    };
+    const includes = [mainInclude, ...componentIncludes];
+    return includes;
+}
+/**
+ *
+ * for testing purposes
+ */
+async function getGitlabCompletePipeline(config) {
+    const includes = await getGitlabPipelineIncludes(config);
+    return includes.reduce((acc, { content }) => {
+        return {
+            ...acc,
+            ...content, // merge all includes into one object
+        };
+    }, {});
+}
+exports.getGitlabCompletePipeline = getGitlabCompletePipeline;
 //# sourceMappingURL=generatePipelineFiles.js.map
 
 /***/ }),

package/dist/bundles/cli/index.js

@@ -8405,7 +8405,7 @@ const createMainPipeline = async (pipelineType, config) => {
         // for all triggers create jobs and add base rules
         const allJobsPerTrigger = await Promise.all(config_1.ALL_PIPELINE_TRIGGERS.map(async (trigger) => await (0, createGitlabJobs_1.createGitlabJobs)(await (0, createAllJobs_1.createAllJobs)({ config, trigger, pipelineType }), getGitlabRulesForTrigger(trigger)))).then((j) => j.flat());
         const allWorkspaceJobs = allJobsPerTrigger
-            .filter((j) => j.context.type === "workspace") // sort by componentName in the same order as they appear in the config
+            .filter((j) => { var _a; return ((_a = j.context) === null || _a === void 0 ? void 0 : _a.type) === "workspace"; }) // sort by componentName in the same order as they appear in the config
             // this is purely for better readability in git diffs when you add new components
             .sort((a, b) => {
             var _a;
@@ -8415,7 +8415,7 @@ const createMainPipeline = async (pipelineType, config) => {
             return aIndex - bIndex;
         });
         const allComponentJobs = allJobsPerTrigger
-            .filter((j) => j.context.type === "component")
+            .filter((j) => { var _a; return ((_a = j.context) === null || _a === void 0 ? void 0 : _a.type) === "component"; })
             // sort by componentName in the same order as they appear in the config
             // this is purely for better readability in git diffs when you add new components
             .sort((a, b) => {
@@ -8424,18 +8424,18 @@ const createMainPipeline = async (pipelineType, config) => {
             const bIndex = componentNames.findIndex((c) => c === b.context.name);
             return aIndex - bIndex;
         });
-        const allJobs = [...allWorkspaceJobs, ...allComponentJobs].reduce((acc, { gitlabJob, name }) => {
+        const allJobs = [...allWorkspaceJobs, ...allComponentJobs].reduce((acc, { gitlabJob, name, context }) => {
             var _a, _b;
             // merge jobs, if a job is already there, merge the rules
             // this is currently needed because of envMode: "none", which creates the same job for all triggers, so it can appear multiple times
             if (acc[name]) {
-                acc[name].rules = [
-                    ...((_a = acc[name].rules) !== null && _a !== void 0 ? _a : []),
+                acc[name].gitlabJob.rules = [
+                    ...((_a = acc[name].gitlabJob.rules) !== null && _a !== void 0 ? _a : []),
                     ...((_b = gitlabJob.rules) !== null && _b !== void 0 ? _b : []),
                 ];
             }
             else {
-                acc[name] = gitlabJob;
+                acc[name] = { context, gitlabJob };
             }
             return acc;
         }, {});
@@ -8443,7 +8443,13 @@ const createMainPipeline = async (pipelineType, config) => {
             stages: [...stages, "release"],
             jobs: {
                 ...allJobs,
-                ...(0, gitlabReleaseJobs_1.getGitlabReleaseJobs)(),
+                ...Object.fromEntries(Object.entries((0, gitlabReleaseJobs_1.getGitlabReleaseJobs)()).map(([name, gitlabJob]) => [
+                    name,
+                    {
+                        gitlabJob,
+                        context: null,
+                    },
+                ])),
             },
             variables: config.runnerVariables,
         });
@@ -8474,32 +8480,83 @@ function getGitlabRulesForTrigger(trigger) {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.generatePipelineFiles = exports.generateLocalPipelineContent = void 0;
+exports.getGitlabCompletePipeline = exports.generatePipelineFiles = void 0;
+const promises_1 = __nccwpck_require__(73292);
+const path_1 = __nccwpck_require__(71017);
 const writeFiles_1 = __nccwpck_require__(92228);
 const createMainPipeline_1 = __nccwpck_require__(39192);
 const sortGitLabJobDefProps_1 = __nccwpck_require__(72361);
-async function generateLocalPipelineContent(config, pipelineType) {
-    const { jobs, image, stages, variables, workflow, ...pipelineRest } = await (0, createMainPipeline_1.createMainPipeline)(pipelineType, config);
-    const jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(([jobName, job]) => [
-        jobName,
-        (0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
-    ]));
-    return {
-        image,
-        stages,
-        variables,
-        workflow,
-        ...pipelineRest,
-        // jobs need to be spread into main YAML, because GitLab pipeline YAML has no jobs key - jobs are top level with their key as their name
-        ...jobsWithSortedProps,
-    };
-}
-exports.generateLocalPipelineContent = generateLocalPipelineContent;
+const CATLADDER_GENERATED_FOLDER = ".catladder-generated";
+const GITLAB_GENERATED_FOLDER = CATLADDER_GENERATED_FOLDER + "/gitlab";
 async function generatePipelineFiles(config, pipelineType) {
-    const pipelineContent = await generateLocalPipelineContent(config, pipelineType);
-    return (0, writeFiles_1.writeYamlfile)(`.gitlab-ci.yml`, pipelineContent);
+    if (pipelineType !== "gitlab") {
+        throw new Error("Pipeline type not supported");
+    }
+    const includes = await getGitlabPipelineIncludes(config);
+    const mainFile = {
+        path: ".gitlab-ci.yml",
+        content: {
+            include: includes.map((i) => i.path),
+        },
+    };
+    const files = [mainFile, ...includes];
+    // first clean up the folder
+    await (0, promises_1.rm)(GITLAB_GENERATED_FOLDER, { recursive: true });
+    // write files
+    await Promise.all(files.map(async ({ path, content }) => {
+        await (0, promises_1.mkdir)((0, path_1.dirname)(path), { recursive: true });
+        await (0, writeFiles_1.writeYamlfile)(path, content);
+    }));
 }
 exports.generatePipelineFiles = generatePipelineFiles;
+async function getGitlabPipelineIncludes(config) {
+    const { jobs, image, stages, variables, workflow, ...pipelineRest } = await (0, createMainPipeline_1.createMainPipeline)("gitlab", config);
+    // we will create 1 include per component or workspace
+    // this is for better readability in git diffs and to avoid problems with yaml files beeing too large
+    // group by context
+    const groups = Object.entries(jobs).reduce((acc, [jobName, { gitlabJob, context }]) => {
+        const group = !context
+            ? "global-jobs"
+            : (context === null || context === void 0 ? void 0 : context.type) + "/" + context.name;
+        if (!acc[group]) {
+            acc[group] = {};
+        }
+        acc[group][jobName] = (0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(gitlabJob); // also sort properties for more consistent diffing
+        return acc;
+    }, {});
+    const componentIncludes = Object.entries(groups).map(([group, jobs]) => {
+        return {
+            path: GITLAB_GENERATED_FOLDER + "/" + group + ".yaml",
+            content: jobs,
+        };
+    });
+    const mainInclude = {
+        path: GITLAB_GENERATED_FOLDER + "/main.yaml",
+        content: {
+            image,
+            stages,
+            variables,
+            workflow,
+            ...pipelineRest,
+        },
+    };
+    const includes = [mainInclude, ...componentIncludes];
+    return includes;
+}
+/**
+ *
+ * for testing purposes
+ */
+async function getGitlabCompletePipeline(config) {
+    const includes = await getGitlabPipelineIncludes(config);
+    return includes.reduce((acc, { content }) => {
+        return {
+            ...acc,
+            ...content, // merge all includes into one object
+        };
+    }, {});
+}
+exports.getGitlabCompletePipeline = getGitlabCompletePipeline;
 //# sourceMappingURL=generatePipelineFiles.js.map
 
 /***/ }),

package/dist/pipeline/src/pipeline/createMainPipeline.js

@@ -14,7 +14,7 @@ const createMainPipeline = async (pipelineType, config) => {
         // for all triggers create jobs and add base rules
         const allJobsPerTrigger = await Promise.all(config_1.ALL_PIPELINE_TRIGGERS.map(async (trigger) => await (0, createGitlabJobs_1.createGitlabJobs)(await (0, createAllJobs_1.createAllJobs)({ config, trigger, pipelineType }), getGitlabRulesForTrigger(trigger)))).then((j) => j.flat());
         const allWorkspaceJobs = allJobsPerTrigger
-            .filter((j) => j.context.type === "workspace") // sort by componentName in the same order as they appear in the config
+            .filter((j) => { var _a; return ((_a = j.context) === null || _a === void 0 ? void 0 : _a.type) === "workspace"; }) // sort by componentName in the same order as they appear in the config
             // this is purely for better readability in git diffs when you add new components
             .sort((a, b) => {
             var _a;
@@ -24,7 +24,7 @@ const createMainPipeline = async (pipelineType, config) => {
             return aIndex - bIndex;
         });
         const allComponentJobs = allJobsPerTrigger
-            .filter((j) => j.context.type === "component")
+            .filter((j) => { var _a; return ((_a = j.context) === null || _a === void 0 ? void 0 : _a.type) === "component"; })
             // sort by componentName in the same order as they appear in the config
             // this is purely for better readability in git diffs when you add new components
             .sort((a, b) => {
@@ -33,18 +33,18 @@ const createMainPipeline = async (pipelineType, config) => {
             const bIndex = componentNames.findIndex((c) => c === b.context.name);
             return aIndex - bIndex;
         });
-        const allJobs = [...allWorkspaceJobs, ...allComponentJobs].reduce((acc, { gitlabJob, name }) => {
+        const allJobs = [...allWorkspaceJobs, ...allComponentJobs].reduce((acc, { gitlabJob, name, context }) => {
             var _a, _b;
             // merge jobs, if a job is already there, merge the rules
             // this is currently needed because of envMode: "none", which creates the same job for all triggers, so it can appear multiple times
             if (acc[name]) {
-                acc[name].rules = [
-                    ...((_a = acc[name].rules) !== null && _a !== void 0 ? _a : []),
+                acc[name].gitlabJob.rules = [
+                    ...((_a = acc[name].gitlabJob.rules) !== null && _a !== void 0 ? _a : []),
                     ...((_b = gitlabJob.rules) !== null && _b !== void 0 ? _b : []),
                 ];
             }
             else {
-                acc[name] = gitlabJob;
+                acc[name] = { context, gitlabJob };
             }
             return acc;
         }, {});
@@ -52,7 +52,13 @@ const createMainPipeline = async (pipelineType, config) => {
             stages: [...stages, "release"],
             jobs: {
                 ...allJobs,
-                ...(0, gitlabReleaseJobs_1.getGitlabReleaseJobs)(),
+                ...Object.fromEntries(Object.entries((0, gitlabReleaseJobs_1.getGitlabReleaseJobs)()).map(([name, gitlabJob]) => [
+                    name,
+                    {
+                        gitlabJob,
+                        context: null,
+                    },
+                ])),
             },
             variables: config.runnerVariables,
         });

package/dist/pipeline/src/pipeline/createMainPipeline.js.map

@@ -1 +1 @@
-{"version":3,"file":"createMainPipeline.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createMainPipeline.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createMainPipeline.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createMainPipeline.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/pipeline/generatePipelineFiles.d.ts

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

package/dist/pipeline/src/pipeline/generatePipelineFiles.js

@@ -1,29 +1,80 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatePipelineFiles = exports.generateLocalPipelineContent = void 0;
+exports.getGitlabCompletePipeline = exports.generatePipelineFiles = void 0;
+const promises_1 = require("fs/promises");
+const path_1 = require("path");
 const writeFiles_1 = require("../utils/writeFiles");
 const createMainPipeline_1 = require("./createMainPipeline");
 const sortGitLabJobDefProps_1 = require("./gitlab/sortGitLabJobDefProps");
-async function generateLocalPipelineContent(config, pipelineType) {
-    const { jobs, image, stages, variables, workflow, ...pipelineRest } = await (0, createMainPipeline_1.createMainPipeline)(pipelineType, config);
-    const jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(([jobName, job]) => [
-        jobName,
-        (0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
-    ]));
-    return {
-        image,
-        stages,
-        variables,
-        workflow,
-        ...pipelineRest,
-        // jobs need to be spread into main YAML, because GitLab pipeline YAML has no jobs key - jobs are top level with their key as their name
-        ...jobsWithSortedProps,
-    };
-}
-exports.generateLocalPipelineContent = generateLocalPipelineContent;
+const CATLADDER_GENERATED_FOLDER = ".catladder-generated";
+const GITLAB_GENERATED_FOLDER = CATLADDER_GENERATED_FOLDER + "/gitlab";
 async function generatePipelineFiles(config, pipelineType) {
-    const pipelineContent = await generateLocalPipelineContent(config, pipelineType);
-    return (0, writeFiles_1.writeYamlfile)(`.gitlab-ci.yml`, pipelineContent);
+    if (pipelineType !== "gitlab") {
+        throw new Error("Pipeline type not supported");
+    }
+    const includes = await getGitlabPipelineIncludes(config);
+    const mainFile = {
+        path: ".gitlab-ci.yml",
+        content: {
+            include: includes.map((i) => i.path),
+        },
+    };
+    const files = [mainFile, ...includes];
+    // first clean up the folder
+    await (0, promises_1.rm)(GITLAB_GENERATED_FOLDER, { recursive: true });
+    // write files
+    await Promise.all(files.map(async ({ path, content }) => {
+        await (0, promises_1.mkdir)((0, path_1.dirname)(path), { recursive: true });
+        await (0, writeFiles_1.writeYamlfile)(path, content);
+    }));
 }
 exports.generatePipelineFiles = generatePipelineFiles;
+async function getGitlabPipelineIncludes(config) {
+    const { jobs, image, stages, variables, workflow, ...pipelineRest } = await (0, createMainPipeline_1.createMainPipeline)("gitlab", config);
+    // we will create 1 include per component or workspace
+    // this is for better readability in git diffs and to avoid problems with yaml files beeing too large
+    // group by context
+    const groups = Object.entries(jobs).reduce((acc, [jobName, { gitlabJob, context }]) => {
+        const group = !context
+            ? "global-jobs"
+            : (context === null || context === void 0 ? void 0 : context.type) + "/" + context.name;
+        if (!acc[group]) {
+            acc[group] = {};
+        }
+        acc[group][jobName] = (0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(gitlabJob); // also sort properties for more consistent diffing
+        return acc;
+    }, {});
+    const componentIncludes = Object.entries(groups).map(([group, jobs]) => {
+        return {
+            path: GITLAB_GENERATED_FOLDER + "/" + group + ".yaml",
+            content: jobs,
+        };
+    });
+    const mainInclude = {
+        path: GITLAB_GENERATED_FOLDER + "/main.yaml",
+        content: {
+            image,
+            stages,
+            variables,
+            workflow,
+            ...pipelineRest,
+        },
+    };
+    const includes = [mainInclude, ...componentIncludes];
+    return includes;
+}
+/**
+ *
+ * for testing purposes
+ */
+async function getGitlabCompletePipeline(config) {
+    const includes = await getGitlabPipelineIncludes(config);
+    return includes.reduce((acc, { content }) => {
+        return {
+            ...acc,
+            ...content, // merge all includes into one object
+        };
+    }, {});
+}
+exports.getGitlabCompletePipeline = getGitlabCompletePipeline;
 //# sourceMappingURL=generatePipelineFiles.js.map

package/dist/pipeline/src/pipeline/generatePipelineFiles.js.map

@@ -1 +1 @@
-{"version":3,"file":"generatePipelineFiles.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/generatePipelineFiles.ts"],"names":[],"mappings":";;;AACA,oDAAoD;AACpD,6DAA0D;AAC1D,0EAAuE;AAEhE,KAAK,UAAU,4BAA4B,CAChD,MAAc,EACd,YAAe;IAEf,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,YAAY,EAAE,GACjE,MAAM,IAAA,uCAAkB,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAEjD,MAAM,mBAAmB,GAAG,MAAM,CAAC,WAAW,CAC5C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;QAC3C,OAAO;QACP,IAAA,6CAAqB,EAAC,GAAG,CAAC;KAC3B,CAAC,CACH,CAAC;IAEF,OAAO;QACL,KAAK;QACL,MAAM;QACN,SAAS;QACT,QAAQ;QACR,GAAG,YAAY;QACf,wIAAwI;QACxI,GAAG,mBAAmB;KACvB,CAAC;AACJ,CAAC;AAvBD,oEAuBC;AAEM,KAAK,UAAU,qBAAqB,CACzC,MAAc,EACd,YAAe;IAEf,MAAM,eAAe,GAAG,MAAM,4BAA4B,CACxD,MAAM,EACN,YAAY,CACb,CAAC;IACF,OAAO,IAAA,0BAAa,EAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;AAC1D,CAAC;AATD,sDASC"}
+{"version":3,"file":"generatePipelineFiles.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/generatePipelineFiles.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.d.ts

@@ -1,11 +1,13 @@
 import type { Context, GitlabJobDef, GitlabRule } from "../../types";
 import type { CatladderJob } from "../../types/jobs";
 import type { AllCatladderJobs } from "../createAllJobs";
-export type AllGitlabJobs = {
-    name: string;
+export type GitlabJobWithContext = {
     gitlabJob: GitlabJobDef;
-    context: Context;
-}[];
+    context: Context | null;
+};
+export type AllGitlabJobs = (GitlabJobWithContext & {
+    name: string;
+})[];
 export declare const GITLAB_ENVIRONMENT_URL_VARIABLE = "CL_GITLAB_ENVIRONMENT_URL";
 export declare const makeGitlabJob: (context: Context, job: CatladderJob<string>, allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => [fullName: string, job: GitlabJobDef];
 export declare const createGitlabJobs: (allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => Promise<AllGitlabJobs>;

package/dist/pipeline/src/types/gitlab-types.d.ts

@@ -1,3 +1,4 @@
+import type { GitlabJobWithContext } from "../pipeline/gitlab/createGitlabJobs";
 import type { Artifacts as GitlabCiArtifacts, JobTemplate, Cache as GitlabJobCache, Rules } from "./gitlab-ci-yml";
 export { Retry, Image as GitlabJobImage } from "./gitlab-ci-yml";
 export type Artifacts = GitlabCiArtifacts;
@@ -22,6 +23,6 @@ export interface GitlabPipeline extends Pick<JobTemplate, "variables"> {
         rules: GitlabRule[];
     };
     stages: string[];
-    jobs: Record<string, GitlabJobDef>;
+    jobs: Record<string, GitlabJobWithContext>;
     before_script?: string[];
 }