@catladder/cli 0.0.0-main-46c5c159 → 0.0.0-main-5c481bfe
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bundles/catenv/index.js +182 -31
- package/dist/bundles/cli/index.js +182 -31
- package/dist/pipeline/src/build/custom/buildJob.js +2 -2
- package/dist/pipeline/src/build/custom/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/docker.d.ts +24 -3
- package/dist/pipeline/src/build/docker.js +38 -8
- package/dist/pipeline/src/build/docker.js.map +1 -1
- package/dist/pipeline/src/build/node/buildJob.js +3 -3
- package/dist/pipeline/src/build/node/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/node/meteor.js +1 -1
- package/dist/pipeline/src/build/node/meteor.js.map +1 -1
- package/dist/pipeline/src/build/types.d.ts +33 -25
- package/dist/pipeline/src/build/types.js.map +1 -1
- package/dist/pipeline/src/pipeline/generatePipelineFiles.js +36 -9
- package/dist/pipeline/src/pipeline/generatePipelineFiles.js.map +1 -1
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js +2 -8
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js.map +1 -1
- package/dist/pipeline/src/pipeline/gitlab/sortGitLabJobDefProps.d.ts +7 -0
- package/dist/pipeline/src/pipeline/gitlab/sortGitLabJobDefProps.js +59 -0
- package/dist/pipeline/src/pipeline/gitlab/sortGitLabJobDefProps.js.map +1 -0
- package/dist/pipeline/src/utils/removeUndefined.d.ts +1 -0
- package/dist/pipeline/src/utils/removeUndefined.js +27 -0
- package/dist/pipeline/src/utils/removeUndefined.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/buildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAE5B,qCAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/buildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAE5B,qCAA0C;AAC1C,oCAAsE;AACtE,kCAAyC;AAGzC,gCAA0C;AAE1C,IAAM,sBAAsB,GAAG;IAC7B,sBAAsB,EAAE,KAAK;IAC7B,yBAAyB,EAAE,KAAK;IAChC,uBAAuB,EAAE,KAAK;CAC/B,CAAC;AAEK,IAAM,qBAAqB,GAAG,UACnC,OAAyB;;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,eAAe,EAAE,sBAAsB;gBACvC,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,QAAQ,EAAE,WAAW,CAAC,WAAW;gBACjC,MAAM,2BAAM,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,YAAY,CAAC,mCAAI,EAAE,CAAC,SAAC;gBAC1D,SAAS,EAAE;oBACT,KAAK;wBACH,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,mBAAmB,CAAC;wBAC5C,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;8BAC5B,CAAC,MAAA,MAAA,WAAW,CAAC,cAAc,0CAAE,GAAG,CAAC,UAAC,IAAI;wBACvC,OAAA,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC;oBAA7B,CAA6B,CAC9B,mCAAI,EAAE,CAAC,SACT;oBACD,SAAS,EAAE,OAAO;iBACnB;aACF;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAAC,OAAO,CAAC;YAE1D,SAAS,EAAE,EAAE;SACd;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AApCW,QAAA,qBAAqB,yBAoChC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { BuildConfigDocker } from ".";
|
|
1
2
|
import type { ComponentContext } from "../types";
|
|
2
3
|
import type { CatladderJob } from "../types/jobs";
|
|
3
4
|
export declare const getDockerImageVariables: (context: ComponentContext) => {
|
|
@@ -21,25 +22,45 @@ export declare const getDockerBuildVariables: (context: ComponentContext) => {
|
|
|
21
22
|
DOCKER_REGISTRY: string;
|
|
22
23
|
DOCKER_IMAGE: import("../bash/BashExpression").StringOrBashExpression;
|
|
23
24
|
DOCKER_CACHE_IMAGE: string;
|
|
24
|
-
DOCKERFILE_ADDITIONS: string;
|
|
25
|
-
DOCKERFILE_ADDITIONS_END: string;
|
|
26
25
|
APP_DIR: string;
|
|
27
26
|
DOCKER_DIR: string;
|
|
27
|
+
DOCKERFILE_ADDITIONS?: undefined;
|
|
28
|
+
DOCKERFILE_ADDITIONS_END?: undefined;
|
|
28
29
|
} | {
|
|
29
30
|
DOCKER_IMAGE_TAG: string;
|
|
30
31
|
DOCKER_REGISTRY: string;
|
|
31
32
|
DOCKER_CACHE_IMAGE: string;
|
|
32
33
|
DOCKER_IMAGE_NAME: string;
|
|
33
34
|
DOCKER_IMAGE: string;
|
|
35
|
+
APP_DIR: string;
|
|
36
|
+
DOCKER_DIR: string;
|
|
37
|
+
DOCKERFILE_ADDITIONS?: undefined;
|
|
38
|
+
DOCKERFILE_ADDITIONS_END?: undefined;
|
|
39
|
+
} | {
|
|
40
|
+
DOCKER_IMAGE_TAG: string;
|
|
41
|
+
DOCKER_REGISTRY: string;
|
|
42
|
+
DOCKER_IMAGE: import("../bash/BashExpression").StringOrBashExpression;
|
|
43
|
+
DOCKER_CACHE_IMAGE: string;
|
|
44
|
+
APP_DIR: string;
|
|
45
|
+
DOCKER_DIR: string;
|
|
34
46
|
DOCKERFILE_ADDITIONS: string;
|
|
35
47
|
DOCKERFILE_ADDITIONS_END: string;
|
|
48
|
+
} | {
|
|
49
|
+
DOCKER_IMAGE_TAG: string;
|
|
50
|
+
DOCKER_REGISTRY: string;
|
|
51
|
+
DOCKER_CACHE_IMAGE: string;
|
|
52
|
+
DOCKER_IMAGE_NAME: string;
|
|
53
|
+
DOCKER_IMAGE: string;
|
|
36
54
|
APP_DIR: string;
|
|
37
55
|
DOCKER_DIR: string;
|
|
56
|
+
DOCKERFILE_ADDITIONS: string;
|
|
57
|
+
DOCKERFILE_ADDITIONS_END: string;
|
|
38
58
|
};
|
|
39
59
|
export declare const DOCKER_BUILD_JOB_NAME = "\uD83D\uDD28 docker";
|
|
40
60
|
export declare const getDockerJobBaseProps: () => Pick<CatladderJob, "image" | "services" | "variables" | "runnerVariables">;
|
|
41
61
|
export type DockerBuildJobDefinition = Partial<CatladderJob>;
|
|
42
62
|
export declare const createDockerBuildJobBase: (context: ComponentContext, { script, ...def }: Partial<CatladderJob>) => CatladderJob;
|
|
43
63
|
export declare const gitlabDockerLogin: (context: ComponentContext) => string[];
|
|
44
|
-
export declare const
|
|
64
|
+
export declare const getDockerBuildScriptWithBuiltInDockerFile: (context: ComponentContext, defaultType?: BuildConfigDocker["type"]) => string[];
|
|
65
|
+
export declare const getDockerBuildDefaultScript: (context: ComponentContext, ensureDockerFileScript?: string | null) => string[];
|
|
45
66
|
export declare const hasDockerfile: (context: ComponentContext) => boolean;
|
|
@@ -50,15 +50,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
50
50
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
51
51
|
};
|
|
52
52
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
53
|
-
exports.hasDockerfile = exports.getDockerBuildDefaultScript = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
|
|
54
|
-
var lodash_1 = require("lodash");
|
|
55
|
-
var deploy_1 = require("../deploy");
|
|
56
|
-
var runner_1 = require("../runner");
|
|
53
|
+
exports.hasDockerfile = exports.getDockerBuildDefaultScript = exports.getDockerBuildScriptWithBuiltInDockerFile = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
|
|
57
54
|
var fs_1 = require("fs");
|
|
55
|
+
var lodash_1 = require("lodash");
|
|
58
56
|
var path_1 = __importDefault(require("path"));
|
|
59
|
-
var
|
|
57
|
+
var deploy_1 = require("../deploy");
|
|
60
58
|
var artifactsRegistry_1 = require("../deploy/cloudRun/artifactsRegistry");
|
|
61
59
|
var gcloudServiceAccountLoginCommands_1 = require("../deploy/cloudRun/utils/gcloudServiceAccountLoginCommands");
|
|
60
|
+
var runner_1 = require("../runner");
|
|
61
|
+
var gitlab_1 = require("../utils/gitlab");
|
|
62
62
|
var DOCKER_BUILD_RUNNER_REQUESTS = {
|
|
63
63
|
KUBERNETES_CPU_REQUEST: "0.5",
|
|
64
64
|
KUBERNETES_MEMORY_REQUEST: "1Gi",
|
|
@@ -100,9 +100,23 @@ var getDockerBuildRunnerVariables = function () { return ({
|
|
|
100
100
|
DOCKER_DRIVER: "overlay2",
|
|
101
101
|
DOCKER_BUILDKIT: "1", // see https://docs.docker.com/develop/develop-images/build_enhancements/
|
|
102
102
|
}); };
|
|
103
|
+
var getDockerAdditions = function (build) {
|
|
104
|
+
var _a, _b;
|
|
105
|
+
if (!("docker" in build))
|
|
106
|
+
return {};
|
|
107
|
+
if (!build.docker)
|
|
108
|
+
return {};
|
|
109
|
+
return {
|
|
110
|
+
DOCKERFILE_ADDITIONS: "additionsBegin" in build.docker
|
|
111
|
+
? (_a = build.docker.additionsBegin) === null || _a === void 0 ? void 0 : _a.join("\n")
|
|
112
|
+
: undefined,
|
|
113
|
+
DOCKERFILE_ADDITIONS_END: "additionsEnd" in build.docker
|
|
114
|
+
? (_b = build.docker.additionsEnd) === null || _b === void 0 ? void 0 : _b.join("\n")
|
|
115
|
+
: undefined,
|
|
116
|
+
};
|
|
117
|
+
};
|
|
103
118
|
var getDockerBuildVariables = function (context) {
|
|
104
|
-
|
|
105
|
-
return __assign({ DOCKERFILE_ADDITIONS: (_b = (_a = context.build.config.docker) === null || _a === void 0 ? void 0 : _a.additionsBegin) === null || _b === void 0 ? void 0 : _b.join("\n"), DOCKERFILE_ADDITIONS_END: (_d = (_c = context.build.config.docker) === null || _c === void 0 ? void 0 : _c.additionsEnd) === null || _d === void 0 ? void 0 : _d.join("\n"), APP_DIR: context.build.dir, DOCKER_DIR: "." }, (0, exports.getDockerImageVariables)(context));
|
|
119
|
+
return __assign(__assign(__assign({}, getDockerAdditions(context.build.config)), { APP_DIR: context.build.dir, DOCKER_DIR: "." }), (0, exports.getDockerImageVariables)(context));
|
|
106
120
|
};
|
|
107
121
|
exports.getDockerBuildVariables = getDockerBuildVariables;
|
|
108
122
|
exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
|
|
@@ -137,9 +151,25 @@ var gitlabDockerLogin = function (context) {
|
|
|
137
151
|
];
|
|
138
152
|
};
|
|
139
153
|
exports.gitlabDockerLogin = gitlabDockerLogin;
|
|
154
|
+
var BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS = {
|
|
155
|
+
meteor: "ensureMeteorDockerfile",
|
|
156
|
+
node: "ensureNodeDockerfile",
|
|
157
|
+
nginx: "ensureNginxDockerfile",
|
|
158
|
+
custom: null,
|
|
159
|
+
};
|
|
160
|
+
var getDockerBuildScriptWithBuiltInDockerFile = function (context, defaultType) {
|
|
161
|
+
var _a;
|
|
162
|
+
var type = "docker" in context.componentConfig.build &&
|
|
163
|
+
context.componentConfig.build.docker &&
|
|
164
|
+
"type" in context.componentConfig.build.docker
|
|
165
|
+
? (_a = context.componentConfig.build.docker) === null || _a === void 0 ? void 0 : _a.type
|
|
166
|
+
: defaultType;
|
|
167
|
+
return (0, exports.getDockerBuildDefaultScript)(context, type ? BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS[type] : null);
|
|
168
|
+
};
|
|
169
|
+
exports.getDockerBuildScriptWithBuiltInDockerFile = getDockerBuildScriptWithBuiltInDockerFile;
|
|
140
170
|
var getDockerBuildDefaultScript = function (context, ensureDockerFileScript) {
|
|
141
171
|
return __spreadArray(__spreadArray(__spreadArray([
|
|
142
|
-
ensureDockerFileScript
|
|
172
|
+
ensureDockerFileScript !== null && ensureDockerFileScript !== void 0 ? ensureDockerFileScript : undefined
|
|
143
173
|
], __read((0, gitlab_1.collapseableSection)("docker-login", "Docker Login")((0, exports.gitlabDockerLogin)(context))), false), __read((0, gitlab_1.collapseableSection)("docker-build", "Docker build")([
|
|
144
174
|
"docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", //BUILDKIT_INLINE_CACHE, see https://testdriven.io/blog/faster-ci-builds-with-docker-cache/
|
|
145
175
|
])), false), __read((0, gitlab_1.collapseableSection)("docker-push", "Docker push and tag")([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,9 +70,9 @@ var createNodeBuildJobs = function (context) {
|
|
|
70
70
|
}
|
|
71
71
|
: undefined,
|
|
72
72
|
dockerBuild: {
|
|
73
|
-
script: (0, docker_1.
|
|
74
|
-
? "
|
|
75
|
-
: "
|
|
73
|
+
script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook"
|
|
74
|
+
? "nginx"
|
|
75
|
+
: "node"),
|
|
76
76
|
cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context.build, "pull")), false),
|
|
77
77
|
variables: {
|
|
78
78
|
// only required for non static
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,uCAA8C;AAG9C,qCAA0C;AAC1C,gCAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,uCAA8C;AAG9C,qCAA0C;AAC1C,gCAA0C;AAC1C,oCAAsE;AACtE,kCAAyC;AACzC,iCAAmE;AACnE,yCAA0D;AAC1D,+BAAwE;AAEjE,IAAM,mBAAmB,GAAG,UACjC,OAAyB;;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,CAAC;QACpE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACzE,CAAC;IAED,IAAM,YAAY,GAAG,IAAA,uBAAc,EAAC,cAAc,CAAC,CAAC;IACpD,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAElD,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,EAAE,MAAA,WAAW,CAAC,QAAQ,mCAAI,YAAY;gBAC3C,eAAe,EAAE,uCAA2B;gBAC5C,KAAK,uDACA,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,QAAQ,CAAC,mCAAI,EAAE,CAAC,kBACzC,IAAA,oBAAY,EAAC,OAAO,CAAC,KAAK,CAAC,kBAC3B,IAAA,oBAAY,EAAC,OAAO,CAAC,SACzB;gBACD,MAAM,yCACD,WAAW,kBACX,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,YAAY,CAAC,mCAAI,EAAE,CAAC,SACjD;gBACD,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,OAAO,CAAC,KAAK,CAAC,GAAG;8BAEd,CAAC,MAAA,MAAA,OAAO,CAAC,KAAK,CAAC,kBAAkB,0CAChC,4BAA4B,mCAAI,EAAE,CAAC,UACvC,OAAO,CAAC,UAAC,GAAG;;wBAAK;4BACjB,IAAA,WAAI,EAAC,GAAG,EAAE,mBAAmB,CAAC;4BAC9B,IAAA,WAAI,EAAC,GAAG,EAAE,MAAM,CAAC;4BACjB,IAAA,WAAI,EAAC,GAAG,EAAE,OAAO,CAAC;kCACf,CAAC,MAAA,MAAA,WAAW,CAAC,cAAc,0CAAE,GAAG,CAAC,UAAC,IAAI;4BACvC,OAAA,IAAA,WAAI,EAAC,GAAG,EAAE,IAAI,CAAC;wBAAf,CAAe,CAChB,mCAAI,EAAE,CAAC,UACT;qBAAA,CAAC;oBACF,SAAS,EAAE,OAAO;oBAClB,IAAI,EAAE,QAAQ;iBACf;gBACD,OAAO,EAAE,WAAW,CAAC,OAAO;aAC7B;YACH,CAAC,CAAC,SAAS;QAEf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAC/C,OAAO,EACP,WAAW,CAAC,IAAI,KAAK,aAAa,IAAI,WAAW,CAAC,IAAI,KAAK,WAAW;gBACpE,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,MAAM,CACX;YACD,KAAK,2BAAM,IAAA,oBAAY,EAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,SAAC;YAC/C,SAAS,EAAE;gBACT,+BAA+B;gBAC/B,2BAA2B,EAAE,IAAA,qCAA8B,EACzD,OAAO,CAAC,KAAK,CACd;gBACD,2BAA2B,EACzB,MAAA,MAAA,OAAO,CAAC,KAAK,CAAC,kBAAkB,0CAAE,mBAAmB,CAClD,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,iCAA0B,GAAG,mBAAS,GAAG,CAAE,EAA3C,CAA2C,CAAC,0CACxD,IAAI,CAAC,IAAI,CAAC;aACjB;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AApEW,QAAA,mBAAmB,uBAoE9B"}
|
|
@@ -75,7 +75,7 @@ var createMeteorBuildJobs = function (context) {
|
|
|
75
75
|
}
|
|
76
76
|
: undefined,
|
|
77
77
|
dockerBuild: {
|
|
78
|
-
script: (0, docker_1.
|
|
78
|
+
script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, "meteor"),
|
|
79
79
|
variables: {
|
|
80
80
|
METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : "",
|
|
81
81
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"meteor.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/meteor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,uCAA8C;AAM9C,gCAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"meteor.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/meteor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,uCAA8C;AAM9C,gCAA0C;AAC1C,oCAAsE;AACtE,kCAAyC;AACzC,iCAAuC;AACvC,+BAAwC;AAExC,IAAM,cAAc,GAAG,UAAC,OAAyB,IAAuB,OAAA;IACtE;QACE,GAAG,EAAE,OAAO,CAAC,aAAa,GAAG,oBAAoB;QACjD,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE;YACL,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,0CAA0C,CAAC;YACnE,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,4BAA4B,CAAC;YACrD,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,wBAAwB,CAAC;YACjD,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,qCAAqC,CAAC;SAC/D;KACF;CACF,EAXuE,CAWvE,CAAC;AACK,IAAM,qBAAqB,GAAG,UACnC,OAAyB;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAElD,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,yCAAM,IAAA,oBAAY,EAAC,OAAO,CAAC,KAAK,CAAC,kBAAK,cAAc,CAAC,OAAO,CAAC,SAAC;gBACnE,KAAK,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC;gBACpC,SAAS,EAAE;oBACT,iCAAiC,EAAE,GAAG,EAAE,yGAAyG;iBAClJ;gBACD,MAAM,yCACD,WAAW;oBAEd,gCAAgC;oBAChC,iDAAiD;oBACjD,gDAAgD;oBAEhD,kNAAkN;oBAElN,sDAAsD;yBACvD;gBACD,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,oBAAoB;wBACxC,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,OAAO;qBAC5B;iBACF;aACF;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAAC,OAAO,EAAE,QAAQ,CAAC;YACpE,SAAS,EAAE;gBACT,sBAAsB,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;aACjE;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AA9CW,QAAA,qBAAqB,yBA8ChC"}
|
|
@@ -51,27 +51,6 @@ export type BuildConfigBase = {
|
|
|
51
51
|
* define the build command
|
|
52
52
|
*/
|
|
53
53
|
buildCommand?: string | string[] | null;
|
|
54
|
-
/**
|
|
55
|
-
* customize docker build
|
|
56
|
-
*/
|
|
57
|
-
docker?: {
|
|
58
|
-
/**
|
|
59
|
-
* Custom Dockerfile lines integrated in the generated Dockerfile before the standard build steps.
|
|
60
|
-
*
|
|
61
|
-
* - [runner-images/docker-build/scripts/ensureNodeDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNodeDockerfile)
|
|
62
|
-
* - [runner-images/docker-build/scripts/ensureNginxDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNginxDockerfile)
|
|
63
|
-
* - [runner-images/docker-build/scripts/ensureMeteorDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureMeteorDockerfile)
|
|
64
|
-
*/
|
|
65
|
-
additionsBegin?: string[];
|
|
66
|
-
/**
|
|
67
|
-
* Custom Dockerfile lines integrated in the generated Dockerfile after the standard build steps.
|
|
68
|
-
*
|
|
69
|
-
* - [runner-images/docker-build/scripts/ensureNodeDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNodeDockerfile)
|
|
70
|
-
* - [runner-images/docker-build/scripts/ensureNginxDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNginxDockerfile)
|
|
71
|
-
* - [runner-images/docker-build/scripts/ensureMeteorDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureMeteorDockerfile)
|
|
72
|
-
*/
|
|
73
|
-
additionsEnd?: string[];
|
|
74
|
-
};
|
|
75
54
|
/**
|
|
76
55
|
* customize lint, set false to disable
|
|
77
56
|
*/
|
|
@@ -116,10 +95,12 @@ export type BuildConfigNodeBase = BuildConfigBase & {
|
|
|
116
95
|
};
|
|
117
96
|
export type BuildConfigNode = {
|
|
118
97
|
type: "node";
|
|
98
|
+
docker?: Omit<BuildConfigDockerBuiltInNode, "type"> | BuildConfigDocker;
|
|
119
99
|
} & BuildConfigNodeBase;
|
|
120
100
|
export type BuildConfigNodeStatic = BuildConfigNodeBase & {
|
|
121
101
|
type: "node-static";
|
|
122
102
|
startCommand?: never;
|
|
103
|
+
docker?: Omit<BuildConfigDockerBuiltInNgninx, "type"> | BuildConfigDocker;
|
|
123
104
|
};
|
|
124
105
|
export type BuildConfigMeteor = BuildConfigNodeBase & {
|
|
125
106
|
type: "meteor";
|
|
@@ -128,18 +109,44 @@ export type BuildConfigMeteor = BuildConfigNodeBase & {
|
|
|
128
109
|
* This is only required if you have custom scripts in your image
|
|
129
110
|
*/
|
|
130
111
|
installScripts?: boolean;
|
|
112
|
+
docker?: Omit<BuildConfigDockerBuiltInMeteor, "type"> | BuildConfigDocker;
|
|
131
113
|
};
|
|
132
|
-
|
|
114
|
+
type BuildConfigDockerWithAdditions = {
|
|
115
|
+
/**
|
|
116
|
+
* Custom Dockerfile lines integrated in the generated Dockerfile before the standard build steps.
|
|
117
|
+
*
|
|
118
|
+
*/
|
|
119
|
+
additionsBegin?: string[];
|
|
120
|
+
/**
|
|
121
|
+
* Custom Dockerfile lines integrated in the generated Dockerfile after the standard build steps.
|
|
122
|
+
*
|
|
123
|
+
*/
|
|
124
|
+
additionsEnd?: string[];
|
|
125
|
+
};
|
|
126
|
+
type BuildConfigDockerBuiltInNode = {
|
|
127
|
+
type: "node";
|
|
128
|
+
} & BuildConfigDockerWithAdditions;
|
|
129
|
+
type BuildConfigDockerBuiltInMeteor = {
|
|
130
|
+
type: "meteor";
|
|
131
|
+
} & BuildConfigDockerWithAdditions;
|
|
132
|
+
type BuildConfigDockerBuiltInNgninx = {
|
|
133
133
|
/**
|
|
134
134
|
* use the built-in nginx image for simple static apps
|
|
135
135
|
*/
|
|
136
136
|
type: "nginx";
|
|
137
|
-
}
|
|
137
|
+
} & BuildConfigDockerWithAdditions;
|
|
138
|
+
type BuildConfigDockerBuiltIn = BuildConfigDockerBuiltInNgninx | BuildConfigDockerBuiltInNode | BuildConfigDockerBuiltInMeteor;
|
|
139
|
+
type BuildConfigDockerCustom = {
|
|
138
140
|
/**
|
|
139
141
|
* custom docker build, expect that a Dockerfile in your directory
|
|
140
142
|
*/
|
|
141
143
|
type: "custom";
|
|
142
|
-
}
|
|
144
|
+
};
|
|
145
|
+
export type BuildConfigDocker = BuildConfigDockerBuiltIn | BuildConfigDockerCustom;
|
|
146
|
+
/**
|
|
147
|
+
* @deprecated this type is no longer used. Use {@link BuildConfigDocker} instead.
|
|
148
|
+
*/
|
|
149
|
+
export type BuildConfigCustomDocker = BuildConfigDockerCustom | BuildConfigDockerBuiltInNgninx;
|
|
143
150
|
export type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" | "audit"> & {
|
|
144
151
|
type: "custom";
|
|
145
152
|
jobImage: GitlabJobImage;
|
|
@@ -147,7 +154,7 @@ export type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" | "audit">
|
|
|
147
154
|
* {@link Services}s used in lint, test, audit, and build jobs.
|
|
148
155
|
*/
|
|
149
156
|
jobServices?: Services;
|
|
150
|
-
docker:
|
|
157
|
+
docker: BuildConfigDocker;
|
|
151
158
|
/**
|
|
152
159
|
* custom lint, disabled when not set
|
|
153
160
|
*/
|
|
@@ -228,3 +235,4 @@ export declare const isOfBuildType: <T extends ("custom" | "node" | "node-static
|
|
|
228
235
|
}> | Extract<BuildConfigStorybook, {
|
|
229
236
|
type: T[number];
|
|
230
237
|
}>;
|
|
238
|
+
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/types.ts"],"names":[],"mappings":";;;AAsRO,IAAM,aAAa,GAAG,UAC3B,CAAc;IACd,eAAW;SAAX,UAAW,EAAX,qBAAW,EAAX,IAAW;QAAX,8BAAW;;IAEX,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC;AALW,QAAA,aAAa,iBAKxB"}
|
|
@@ -57,15 +57,32 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
57
57
|
}
|
|
58
58
|
return t;
|
|
59
59
|
};
|
|
60
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
61
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
62
|
+
if (!m) return o;
|
|
63
|
+
var i = m.call(o), r, ar = [], e;
|
|
64
|
+
try {
|
|
65
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
66
|
+
}
|
|
67
|
+
catch (error) { e = { error: error }; }
|
|
68
|
+
finally {
|
|
69
|
+
try {
|
|
70
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
71
|
+
}
|
|
72
|
+
finally { if (e) throw e.error; }
|
|
73
|
+
}
|
|
74
|
+
return ar;
|
|
75
|
+
};
|
|
60
76
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
61
77
|
exports.generatePipelineFiles = void 0;
|
|
62
78
|
var writeFiles_1 = require("../utils/writeFiles");
|
|
63
79
|
var createChildPipeline_1 = require("./createChildPipeline");
|
|
64
80
|
var createMainPipeline_1 = require("./createMainPipeline");
|
|
65
81
|
var getPipelineTriggerForGitlabChildPipeline_1 = require("./gitlab/getPipelineTriggerForGitlabChildPipeline");
|
|
82
|
+
var sortGitLabJobDefProps_1 = require("./gitlab/sortGitLabJobDefProps");
|
|
66
83
|
function generatePipelineFiles(config, pipelineType, mode) {
|
|
67
84
|
return __awaiter(this, void 0, void 0, function () {
|
|
68
|
-
var trigger, _a, jobs, image, stages, variables, workflow,
|
|
85
|
+
var trigger, _a, jobs, image, stages, variables, workflow, pipelineRest, jobsWithSortedProps, _b, jobs, image, stages, variables, workflow, pipelineRest, jobsWithSortedProps;
|
|
69
86
|
return __generator(this, function (_c) {
|
|
70
87
|
switch (_c.label) {
|
|
71
88
|
case 0:
|
|
@@ -73,20 +90,30 @@ function generatePipelineFiles(config, pipelineType, mode) {
|
|
|
73
90
|
trigger = (0, getPipelineTriggerForGitlabChildPipeline_1.getPipelineTriggerForGitlabChildPipeline)();
|
|
74
91
|
return [4 /*yield*/, (0, createChildPipeline_1.createChildPipeline)(pipelineType, trigger, config)];
|
|
75
92
|
case 1:
|
|
76
|
-
_a = _c.sent(), jobs = _a.jobs, image = _a.image, stages = _a.stages, variables = _a.variables, workflow = _a.workflow,
|
|
77
|
-
|
|
78
|
-
|
|
93
|
+
_a = _c.sent(), jobs = _a.jobs, image = _a.image, stages = _a.stages, variables = _a.variables, workflow = _a.workflow, pipelineRest = __rest(_a, ["jobs", "image", "stages", "variables", "workflow"]);
|
|
94
|
+
jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(function (_a) {
|
|
95
|
+
var _b = __read(_a, 2), jobName = _b[0], job = _b[1];
|
|
96
|
+
return [
|
|
97
|
+
jobName,
|
|
98
|
+
(0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
|
|
99
|
+
];
|
|
100
|
+
}));
|
|
101
|
+
return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)("__pipeline.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, pipelineRest), jobsWithSortedProps))];
|
|
79
102
|
case 2:
|
|
80
|
-
// need to spread out the jobs, forgot why
|
|
81
103
|
_c.sent();
|
|
82
104
|
return [3 /*break*/, 6];
|
|
83
105
|
case 3: return [4 /*yield*/, (0, createMainPipeline_1.createMainPipeline)(pipelineType, config)];
|
|
84
106
|
case 4:
|
|
85
|
-
_b = _c.sent(), jobs = _b.jobs, image = _b.image, stages = _b.stages, variables = _b.variables, workflow = _b.workflow,
|
|
86
|
-
|
|
87
|
-
|
|
107
|
+
_b = _c.sent(), jobs = _b.jobs, image = _b.image, stages = _b.stages, variables = _b.variables, workflow = _b.workflow, pipelineRest = __rest(_b, ["jobs", "image", "stages", "variables", "workflow"]);
|
|
108
|
+
jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(function (_a) {
|
|
109
|
+
var _b = __read(_a, 2), jobName = _b[0], job = _b[1];
|
|
110
|
+
return [
|
|
111
|
+
jobName,
|
|
112
|
+
(0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
|
|
113
|
+
];
|
|
114
|
+
}));
|
|
115
|
+
return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)(".gitlab-ci.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, pipelineRest), jobsWithSortedProps))];
|
|
88
116
|
case 5:
|
|
89
|
-
// need to spread out the jobs, forgot why
|
|
90
117
|
_c.sent();
|
|
91
118
|
_c.label = 6;
|
|
92
119
|
case 6: return [2 /*return*/];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generatePipelineFiles.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/generatePipelineFiles.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generatePipelineFiles.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/generatePipelineFiles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoD;AACpD,6DAA4D;AAC5D,2DAA0D;AAC1D,8GAA6G;AAC7G,wEAAuE;AACvE,SAAsB,qBAAqB,CACzC,MAAc,EACd,YAAe,EACf,IAAqB;;;;;;yBAEjB,CAAA,IAAI,KAAK,eAAe,CAAA,EAAxB,wBAAwB;oBACpB,OAAO,GAAG,IAAA,mFAAwC,GAAE,CAAC;oBAGzD,qBAAM,IAAA,yCAAmB,EAAC,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,EAAA;;oBADpD,KACJ,SAAwD,EADlD,IAAI,UAAA,EAAE,KAAK,WAAA,EAAE,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,QAAQ,cAAA,EAAK,YAAY,cAA3D,oDAA6D,CAAF;oBAE3D,mBAAmB,GAAG,MAAM,CAAC,WAAW,CAC5C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAC,EAAc;4BAAd,KAAA,aAAc,EAAb,OAAO,QAAA,EAAE,GAAG,QAAA;wBAAM,OAAA;4BAC3C,OAAO;4BACP,IAAA,6CAAqB,EAAC,GAAG,CAAC;yBAC3B;oBAH4C,CAG5C,CAAC,CACH,CAAC;oBACF,qBAAM,IAAA,0BAAa,EAAC,gBAAgB,sBAClC,KAAK,OAAA,EACL,MAAM,QAAA,EACN,SAAS,WAAA,EACT,QAAQ,UAAA,IACL,YAAY,GAEZ,mBAAmB,EACtB,EAAA;;oBARF,SAQE,CAAC;;wBAGD,qBAAM,IAAA,uCAAkB,EAAC,YAAY,EAAE,MAAM,CAAC,EAAA;;oBAD1C,KACJ,SAA8C,EADxC,IAAI,UAAA,EAAE,KAAK,WAAA,EAAE,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,QAAQ,cAAA,EAAK,YAAY,cAA3D,oDAA6D,CAAF;oBAE3D,mBAAmB,GAAG,MAAM,CAAC,WAAW,CAC5C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAC,EAAc;4BAAd,KAAA,aAAc,EAAb,OAAO,QAAA,EAAE,GAAG,QAAA;wBAAM,OAAA;4BAC3C,OAAO;4BACP,IAAA,6CAAqB,EAAC,GAAG,CAAC;yBAC3B;oBAH4C,CAG5C,CAAC,CACH,CAAC;oBACF,qBAAM,IAAA,0BAAa,EAAC,gBAAgB,sBAClC,KAAK,OAAA,EACL,MAAM,QAAA,EACN,SAAS,WAAA,EACT,QAAQ,UAAA,IACL,YAAY,GAEZ,mBAAmB,EACtB,EAAA;;oBARF,SAQE,CAAC;;;;;;CAEN;AA5CD,sDA4CC"}
|
|
@@ -89,13 +89,8 @@ var getInjectVarsScript_1 = require("../../bash/getInjectVarsScript");
|
|
|
89
89
|
var defaults_1 = require("../../defaults");
|
|
90
90
|
var utils_1 = require("../../utils");
|
|
91
91
|
var gitlab_1 = require("../../utils/gitlab");
|
|
92
|
+
var removeUndefined_1 = require("../../utils/removeUndefined");
|
|
92
93
|
exports.GITLAB_ENVIRONMENT_URL_VARIABLE = "CL_GITLAB_ENVIRONMENT_URL";
|
|
93
|
-
var removeUndefined = function (obj) {
|
|
94
|
-
return Object.fromEntries(Object.entries(obj).filter(function (_a) {
|
|
95
|
-
var _b = __read(_a, 2), value = _b[1];
|
|
96
|
-
return value !== undefined;
|
|
97
|
-
}));
|
|
98
|
-
};
|
|
99
94
|
var getFullJobName = function (name, componentName, env) {
|
|
100
95
|
if (env) {
|
|
101
96
|
return "".concat(componentName, " ").concat(name, " | ").concat(env, " ");
|
|
@@ -173,8 +168,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
|
|
|
173
168
|
var modified = addGitlabEnvironment(context, environment, __assign(__assign({}, job), { rules: rules.length > 0 ? rules : undefined, variables: __assign(__assign({}, legacyRunnerVariables), runnerVariables), script: __spreadArray(__spreadArray([], __read(varsInjectScripts), false), __read(((_c = script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil)) !== null && _c !== void 0 ? _c : [])), false), tags: jobTags, stage: stage,
|
|
174
169
|
// sort in a predictable manner for snapshot tests
|
|
175
170
|
needs: deduplicatedGitlabNeeds, retry: defaults_1.BASE_RETRY, interruptible: true }), componentName, env, allJobs);
|
|
176
|
-
|
|
177
|
-
return [fullJobName, gitlabJob];
|
|
171
|
+
return [fullJobName, (0, removeUndefined_1.removeUndefined)(modified)];
|
|
178
172
|
};
|
|
179
173
|
exports.makeGitlabJob = makeGitlabJob;
|
|
180
174
|
var addGitlabEnvironment = function (context, environment, job, componentName, env, // TODO: we could actually pull this from contxt
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createGitlabJobs.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/createGitlabJobs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAyC;AACzC,sEAAqE;AACrE,2CAA4C;AAQ5C,qCAAqC;AACrC,6CAAyD;
|
|
1
|
+
{"version":3,"file":"createGitlabJobs.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/createGitlabJobs.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { GitlabJobDef } from "../../types";
|
|
2
|
+
/**
|
|
3
|
+
* Sorts the properties of a GitLab job definition based on the desired order.
|
|
4
|
+
*
|
|
5
|
+
* This is only useful when generating a GitLab pipeline YAML file.
|
|
6
|
+
*/
|
|
7
|
+
export declare const sortGitLabJobDefProps: (jobDef: GitlabJobDef) => GitlabJobDef;
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.sortGitLabJobDefProps = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* The desired order of GitLab job definition keys.
|
|
6
|
+
*/
|
|
7
|
+
var jobDefOrder = [
|
|
8
|
+
"stage",
|
|
9
|
+
"tags",
|
|
10
|
+
"image",
|
|
11
|
+
"services",
|
|
12
|
+
"variables",
|
|
13
|
+
"before_script",
|
|
14
|
+
"script",
|
|
15
|
+
"after_script",
|
|
16
|
+
"cache",
|
|
17
|
+
"coverage",
|
|
18
|
+
"environment",
|
|
19
|
+
"release",
|
|
20
|
+
"artifacts",
|
|
21
|
+
"rules",
|
|
22
|
+
"only",
|
|
23
|
+
"except",
|
|
24
|
+
"needs",
|
|
25
|
+
"dependencies",
|
|
26
|
+
"trigger",
|
|
27
|
+
"retry",
|
|
28
|
+
"interruptible",
|
|
29
|
+
"allow_failure",
|
|
30
|
+
"parallel",
|
|
31
|
+
"hooks",
|
|
32
|
+
"resource_group",
|
|
33
|
+
];
|
|
34
|
+
var sortGitLabJobDefKeys = function (jobDef) {
|
|
35
|
+
return Object.keys(jobDef).sort(function (a, b) {
|
|
36
|
+
return jobDefOrder.indexOf(a) === -1 && jobDefOrder.indexOf(b) === -1
|
|
37
|
+
? 0
|
|
38
|
+
: jobDefOrder.indexOf(a) === -1
|
|
39
|
+
? 1
|
|
40
|
+
: jobDefOrder.indexOf(b) === -1
|
|
41
|
+
? -1
|
|
42
|
+
: jobDefOrder.indexOf(a) - jobDefOrder.indexOf(b);
|
|
43
|
+
});
|
|
44
|
+
};
|
|
45
|
+
/**
|
|
46
|
+
* Sorts the properties of a GitLab job definition based on the desired order.
|
|
47
|
+
*
|
|
48
|
+
* This is only useful when generating a GitLab pipeline YAML file.
|
|
49
|
+
*/
|
|
50
|
+
var sortGitLabJobDefProps = function (jobDef) {
|
|
51
|
+
return sortGitLabJobDefKeys(jobDef).reduce(function (acc, key) {
|
|
52
|
+
var _a;
|
|
53
|
+
return jobDef[key] !== undefined
|
|
54
|
+
? Object.assign(acc, (_a = {}, _a[key] = jobDef[key], _a))
|
|
55
|
+
: acc;
|
|
56
|
+
}, {});
|
|
57
|
+
};
|
|
58
|
+
exports.sortGitLabJobDefProps = sortGitLabJobDefProps;
|
|
59
|
+
//# sourceMappingURL=sortGitLabJobDefProps.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sortGitLabJobDefProps.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/sortGitLabJobDefProps.ts"],"names":[],"mappings":";;;AAIA;;GAEG;AACH,IAAM,WAAW,GAAsB;IACrC,OAAO;IACP,MAAM;IACN,OAAO;IACP,UAAU;IACV,WAAW;IACX,eAAe;IACf,QAAQ;IACR,cAAc;IACd,OAAO;IACP,UAAU;IACV,aAAa;IACb,SAAS;IACT,WAAW;IACX,OAAO;IACP,MAAM;IACN,QAAQ;IACR,OAAO;IACP,cAAc;IACd,SAAS;IACT,OAAO;IACP,eAAe;IACf,eAAe;IACf,UAAU;IACV,OAAO;IACP,gBAAgB;CACjB,CAAC;AAEF,IAAM,oBAAoB,GAAG,UAAC,MAAoB;IAChD,OAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAuB,CAAC,IAAI,CAAC,UAAC,CAAC,EAAE,CAAC;QACnD,OAAA,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;YACH,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBAC7B,CAAC,CAAC,CAAC;gBACH,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;oBAC7B,CAAC,CAAC,CAAC,CAAC;oBACJ,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;IANvD,CAMuD,CACxD;AARD,CAQC,CAAC;AAEJ;;;;GAIG;AACI,IAAM,qBAAqB,GAAG,UAAC,MAAoB;IACxD,OAAA,oBAAoB,CAAC,MAAM,CAAC,CAAC,MAAM,CACjC,UAAC,GAAG,EAAE,GAAG;;QACP,OAAA,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS;YACvB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,YAAI,GAAC,GAAG,IAAG,MAAM,CAAC,GAAG,CAAC,MAAG;YAC5C,CAAC,CAAC,GAAG;IAFP,CAEO,EACT,EAAkB,CACnB;AAND,CAMC,CAAC;AAPS,QAAA,qBAAqB,yBAO9B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const removeUndefined: <T extends object>(obj: T) => T;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
3
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
4
|
+
if (!m) return o;
|
|
5
|
+
var i = m.call(o), r, ar = [], e;
|
|
6
|
+
try {
|
|
7
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
8
|
+
}
|
|
9
|
+
catch (error) { e = { error: error }; }
|
|
10
|
+
finally {
|
|
11
|
+
try {
|
|
12
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
13
|
+
}
|
|
14
|
+
finally { if (e) throw e.error; }
|
|
15
|
+
}
|
|
16
|
+
return ar;
|
|
17
|
+
};
|
|
18
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
|
+
exports.removeUndefined = void 0;
|
|
20
|
+
var removeUndefined = function (obj) {
|
|
21
|
+
return Object.fromEntries(Object.entries(obj).filter(function (_a) {
|
|
22
|
+
var _b = __read(_a, 2), value = _b[1];
|
|
23
|
+
return value !== undefined;
|
|
24
|
+
}));
|
|
25
|
+
};
|
|
26
|
+
exports.removeUndefined = removeUndefined;
|
|
27
|
+
//# sourceMappingURL=removeUndefined.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"removeUndefined.js","sourceRoot":"","sources":["../../../../../pipeline/src/utils/removeUndefined.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAO,IAAM,eAAe,GAAG,UAAmB,GAAM;IACtD,OAAA,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,UAAC,EAAS;YAAT,KAAA,aAAS,EAAN,KAAK,QAAA;QAAM,OAAA,KAAK,KAAK,SAAS;IAAnB,CAAmB,CAAC,CAC1D;AAFN,CAEM,CAAC;AAHI,QAAA,eAAe,mBAGnB"}
|