@catladder/cli 1.165.1 → 1.166.0
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 +3 -3
- package/dist/bundles/cli/index.js +1 -1
- package/dist/pipeline/src/build/base/createAppBuildJob.d.ts +3 -2
- package/dist/pipeline/src/build/base/createAppBuildJob.js +5 -4
- package/dist/pipeline/src/build/base/createAppBuildJob.js.map +1 -1
- package/dist/pipeline/src/build/base/createBuildJobDefinition.d.ts +7 -0
- package/dist/pipeline/src/build/base/createBuildJobDefinition.js +30 -0
- package/dist/pipeline/src/build/base/createBuildJobDefinition.js.map +1 -0
- package/dist/pipeline/src/build/cache/createJobCache.d.ts +6 -0
- package/dist/pipeline/src/build/cache/createJobCache.js +57 -0
- package/dist/pipeline/src/build/cache/createJobCache.js.map +1 -0
- package/dist/pipeline/src/build/cache/getAllCacheConfigsFromConfig.d.ts +3 -0
- package/dist/pipeline/src/build/cache/getAllCacheConfigsFromConfig.js +28 -0
- package/dist/pipeline/src/build/cache/getAllCacheConfigsFromConfig.js.map +1 -0
- package/dist/pipeline/src/build/cache/transformLegacyJobCache.d.ts +3 -0
- package/dist/pipeline/src/build/cache/transformLegacyJobCache.js +17 -0
- package/dist/pipeline/src/build/cache/transformLegacyJobCache.js.map +1 -0
- package/dist/pipeline/src/build/custom/buildJob.js +2 -14
- package/dist/pipeline/src/build/custom/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/custom/testJob.d.ts +1 -1
- package/dist/pipeline/src/build/custom/testJob.js +12 -11
- package/dist/pipeline/src/build/custom/testJob.js.map +1 -1
- package/dist/pipeline/src/build/docker.d.ts +3 -3
- package/dist/pipeline/src/build/docker.js +3 -1
- package/dist/pipeline/src/build/docker.js.map +1 -1
- package/dist/pipeline/src/build/node/buildJob.js +5 -22
- package/dist/pipeline/src/build/node/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/node/cache.d.ts +6 -6
- package/dist/pipeline/src/build/node/cache.js +12 -15
- package/dist/pipeline/src/build/node/cache.js.map +1 -1
- package/dist/pipeline/src/build/node/meteor.js +5 -6
- package/dist/pipeline/src/build/node/meteor.js.map +1 -1
- package/dist/pipeline/src/build/node/testJob.js +6 -5
- package/dist/pipeline/src/build/node/testJob.js.map +1 -1
- package/dist/pipeline/src/build/node/yarn.js +1 -2
- package/dist/pipeline/src/build/node/yarn.js.map +1 -1
- package/dist/pipeline/src/build/rails/test.js +3 -3
- package/dist/pipeline/src/build/rails/test.js.map +1 -1
- package/dist/pipeline/src/build/sbom.js +1 -1
- package/dist/pipeline/src/build/sbom.js.map +1 -1
- package/dist/pipeline/src/build/types.d.ts +43 -4
- package/dist/pipeline/src/build/types.js.map +1 -1
- package/dist/pipeline/src/types/gitlab-types.d.ts +2 -2
- package/dist/pipeline/src/types/index.d.ts +1 -0
- package/dist/pipeline/src/types/index.js +1 -0
- package/dist/pipeline/src/types/index.js.map +1 -1
- package/dist/pipeline/src/types/jobDefinition.d.ts +5 -0
- package/dist/pipeline/src/types/jobDefinition.js +3 -0
- package/dist/pipeline/src/types/jobDefinition.js.map +1 -0
- package/dist/pipeline/src/types/jobs.d.ts +3 -2
- package/dist/pipeline/src/types/jobs.js.map +1 -1
- package/dist/pipeline/src/utils/index.d.ts +2 -1
- package/dist/pipeline/src/utils/index.js +4 -2
- package/dist/pipeline/src/utils/index.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createMeteorBuildJobs = void 0;
|
|
4
|
-
const path_1 = require("path");
|
|
5
4
|
const runner_1 = require("../../runner");
|
|
6
5
|
const base_1 = require("../base");
|
|
7
6
|
const docker_1 = require("../docker");
|
|
@@ -10,13 +9,13 @@ const cache_1 = require("./cache");
|
|
|
10
9
|
const yarn_1 = require("./yarn");
|
|
11
10
|
const getMeteorCache = (context) => [
|
|
12
11
|
{
|
|
13
|
-
key:
|
|
12
|
+
key: "meteor-build-cache",
|
|
14
13
|
policy: "pull-push",
|
|
15
14
|
paths: [
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
15
|
+
".meteor/local/resolver-result-cache.json",
|
|
16
|
+
".meteor/local/plugin-cache",
|
|
17
|
+
".meteor/local/isopacks",
|
|
18
|
+
".meteor/local/bundler-cache/scanner",
|
|
20
19
|
],
|
|
21
20
|
},
|
|
22
21
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"meteor.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/meteor.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"meteor.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/meteor.ts"],"names":[],"mappings":";;;AAAA,yCAA8C;AAK9C,kCAAmD;AACnD,sCAAsE;AAEtE,oCAAyC;AACzC,mCAAuC;AACvC,iCAAwC;AAExC,MAAM,cAAc,GAAG,CAAC,OAAyB,EAAiB,EAAE,CAAC;IACnE;QACE,GAAG,EAAE,oBAAoB;QACzB,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE;YACL,0CAA0C;YAC1C,4BAA4B;YAC5B,wBAAwB;YACxB,qCAAqC;SACtC;KACF;CACF,CAAC;AACK,MAAM,qBAAqB,GAAG,CACnC,OAAyB,EACT,EAAE;IAClB,MAAM,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,MAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;IAE5C,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,EAAE,CAAC,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;gBAC7D,KAAK,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC;gBACpC,SAAS,EAAE;oBACT,iCAAiC,EAAE,GAAG,EAAE,yGAAyG;iBAClJ;gBACD,MAAM,EAAE;oBACN,GAAG,WAAW;oBAEd,gCAAgC;oBAChC,iDAAiD;oBACjD,gDAAgD;oBAEhD,kNAAkN;oBAElN,sDAAsD;iBACvD;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;AAxCW,QAAA,qBAAqB,yBAwChC"}
|
|
@@ -8,6 +8,7 @@ const createArtifactsConfig_1 = require("../base/createArtifactsConfig");
|
|
|
8
8
|
const cache_1 = require("./cache");
|
|
9
9
|
const constants_1 = require("./constants");
|
|
10
10
|
const yarn_1 = require("./yarn");
|
|
11
|
+
const createJobCache_1 = require("../cache/createJobCache");
|
|
11
12
|
const createNodeTestJobs = (context) => {
|
|
12
13
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
|
|
13
14
|
// don't run tests after release
|
|
@@ -46,7 +47,7 @@ const createNodeTestJobs = (context) => {
|
|
|
46
47
|
cache: undefined, // audit does not need yarn install and no cache
|
|
47
48
|
script: [
|
|
48
49
|
`cd ${context.build.dir}`,
|
|
49
|
-
...((_e = (0, utils_1.
|
|
50
|
+
...((_e = (0, utils_1.ensureArrayOrNull)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : [
|
|
50
51
|
context.packageManagerInfo.isClassic
|
|
51
52
|
? "yarn audit"
|
|
52
53
|
: "yarn npm audit --environment production", // yarn 2
|
|
@@ -61,12 +62,12 @@ const createNodeTestJobs = (context) => {
|
|
|
61
62
|
name: "👮 lint",
|
|
62
63
|
...base,
|
|
63
64
|
image: (_j = (_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.jobImage) !== null && _j !== void 0 ? _j : defaultImage,
|
|
64
|
-
cache: (0, cache_1.getNodeCache)(context),
|
|
65
|
+
cache: (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, (0, cache_1.getNodeCache)(context)),
|
|
65
66
|
script: [
|
|
66
67
|
...(0, yarn_1.ensureNodeVersion)(context),
|
|
67
68
|
`cd ${context.build.dir}`,
|
|
68
69
|
...yarnInstall,
|
|
69
|
-
...((_l = (0, utils_1.
|
|
70
|
+
...((_l = (0, utils_1.ensureArrayOrNull)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : ["yarn lint"]),
|
|
70
71
|
],
|
|
71
72
|
...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_m = buildConfig.lint) === null || _m === void 0 ? void 0 : _m.artifactsReports, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.artifacts),
|
|
72
73
|
}
|
|
@@ -76,12 +77,12 @@ const createNodeTestJobs = (context) => {
|
|
|
76
77
|
name: "🧪 test",
|
|
77
78
|
...base,
|
|
78
79
|
image: (_q = (_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.jobImage) !== null && _q !== void 0 ? _q : (0, runner_1.getRunnerImage)("jobs-testing-chrome"),
|
|
79
|
-
cache: (0, cache_1.getNodeCache)(context),
|
|
80
|
+
cache: (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, (0, cache_1.getNodeCache)(context)),
|
|
80
81
|
script: [
|
|
81
82
|
...(0, yarn_1.ensureNodeVersion)(context),
|
|
82
83
|
`cd ${context.build.dir}`,
|
|
83
84
|
...yarnInstall,
|
|
84
|
-
...((_s = (0, utils_1.
|
|
85
|
+
...((_s = (0, utils_1.ensureArrayOrNull)((_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.command)) !== null && _s !== void 0 ? _s : ["yarn test"]),
|
|
85
86
|
],
|
|
86
87
|
...(0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_t = buildConfig.test) === null || _t === void 0 ? void 0 : _t.artifactsReports, (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.artifacts),
|
|
87
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/testJob.ts"],"names":[],"mappings":";;;AAAA,yCAA8C;AAE9C,iDAG6B;AAE7B,
|
|
1
|
+
{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/testJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,6 @@ const ensureNodeVersion = (context) => (0, gitlab_1.collapseableSection)("nodein
|
|
|
19
19
|
]);
|
|
20
20
|
exports.ensureNodeVersion = ensureNodeVersion;
|
|
21
21
|
const getYarnInstall = (context, options) => {
|
|
22
|
-
var _a;
|
|
23
22
|
const postInstall = context.type !== "workspace" && "postInstall" in context.build.config
|
|
24
23
|
? context.build.config.postInstall
|
|
25
24
|
: null;
|
|
@@ -27,7 +26,7 @@ const getYarnInstall = (context, options) => {
|
|
|
27
26
|
...(0, exports.ensureNodeVersion)(context),
|
|
28
27
|
...(0, gitlab_1.collapseableSection)("yarninstall", "Yarn install")([getYarnInstallCommand(context)]),
|
|
29
28
|
...(postInstall && !(options === null || options === void 0 ? void 0 : options.noCustomPostInstall)
|
|
30
|
-
? (0, gitlab_1.collapseableSection)("postinstall", "Custom post install")((
|
|
29
|
+
? (0, gitlab_1.collapseableSection)("postinstall", "Custom post install")((0, utils_1.ensureArray)(postInstall))
|
|
31
30
|
: []),
|
|
32
31
|
];
|
|
33
32
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/yarn.ts"],"names":[],"mappings":";;;AAAA,8DAA2D;AAE3D,uCAA0C;AAC1C,+CAAyD;AAEzD,MAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAE9D,8CAA8C;AAC9C,MAAM,uBAAuB,GAAG,oDAAoD,CAAC;AAErF,MAAM,qBAAqB,GAAG,CAAC,OAAgB,EAAE,EAAE;IACjD,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,OAAO,0BAA0B,CAAC;AACpC,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,CAAC,OAAgB,EAAE,EAAE,CACpD,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC;IACA,yDAAyD;IACzD,yEAAyE;CAC1E,CAAC,CAAC;AAPQ,QAAA,iBAAiB,qBAOzB;AAEE,MAAM,cAAc,GAAG,CAC5B,OAAgB,EAChB,OAEC,EACD,EAAE
|
|
1
|
+
{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/yarn.ts"],"names":[],"mappings":";;;AAAA,8DAA2D;AAE3D,uCAA0C;AAC1C,+CAAyD;AAEzD,MAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAE9D,8CAA8C;AAC9C,MAAM,uBAAuB,GAAG,oDAAoD,CAAC;AAErF,MAAM,qBAAqB,GAAG,CAAC,OAAgB,EAAE,EAAE;IACjD,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,OAAO,0BAA0B,CAAC;AACpC,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,CAAC,OAAgB,EAAE,EAAE,CACpD,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC;IACA,yDAAyD;IACzD,yEAAyE;CAC1E,CAAC,CAAC;AAPQ,QAAA,iBAAiB,qBAOzB;AAEE,MAAM,cAAc,GAAG,CAC5B,OAAgB,EAChB,OAEC,EACD,EAAE;IACF,MAAM,WAAW,GACf,OAAO,CAAC,IAAI,KAAK,WAAW,IAAI,aAAa,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM;QACnE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW;QAClC,CAAC,CAAC,IAAI,CAAC;IACX,OAAO;QACL,GAAG,IAAA,yBAAiB,EAAC,OAAO,CAAC;QAC7B,GAAG,IAAA,4BAAmB,EACpB,aAAa,EACb,cAAc,CACf,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;QACnC,GAAG,CAAC,WAAW,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,CAAA;YAC9C,CAAC,CAAC,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC,IAAA,mBAAW,EAAC,WAAW,CAAC,CAAC;YAC7B,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,cAAc,kBAuBzB;AAEF,MAAM,iBAAiB,GAAG,mCAAmC,CAAC;AAEvD,MAAM,8BAA8B,GAAG,CAAC,OAAgB,EAAE,EAAE;IACjE,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,IAAI,+BAAc,CACvB;MACA,oBAAoB;EACxB,iBAAiB;MACb,oBAAoB;KACrB,CAAC,IAAI,EAAE,CACP,CAAC;IACJ,CAAC;IAED,wFAAwF;IACxF,8CAA8C;IAC9C,MAAM,6BAA6B,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1D,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CACjD,CAAC;IACF,MAAM,6BAA6B,GAAG,6BAA6B;QACjE,CAAC,CAAC,wCAAwC;QAC1C,CAAC,CAAC,EAAE,CAAC;IAEP,yCAAyC;IACzC,iGAAiG;IACjG,OAAO,IAAI,+BAAc,CACvB;EACF,iBAAiB;EACjB,6BAA6B;MACzB,uBAAuB;;KAExB,CAAC,IAAI,EAAE,CACT,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,8BAA8B,kCA8BzC"}
|
|
@@ -45,7 +45,7 @@ const createRailsTestJobs = (context) => {
|
|
|
45
45
|
image: (_d = (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : buildConfig.jobImage) !== null && _d !== void 0 ? _d : defaultImage,
|
|
46
46
|
script: [
|
|
47
47
|
`cd ${context.build.dir}`,
|
|
48
|
-
...((_f = (0, utils_1.
|
|
48
|
+
...((_f = (0, utils_1.ensureArrayOrNull)((_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.command)) !== null && _f !== void 0 ? _f : [
|
|
49
49
|
"gem install bundler-audit",
|
|
50
50
|
"bundle audit check",
|
|
51
51
|
]),
|
|
@@ -62,7 +62,7 @@ const createRailsTestJobs = (context) => {
|
|
|
62
62
|
script: [
|
|
63
63
|
`cd ${context.build.dir}`,
|
|
64
64
|
...bundlerInstall,
|
|
65
|
-
...((_l = (0, utils_1.
|
|
65
|
+
...((_l = (0, utils_1.ensureArrayOrNull)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : [
|
|
66
66
|
"bundle exec rubocop",
|
|
67
67
|
]),
|
|
68
68
|
],
|
|
@@ -77,7 +77,7 @@ const createRailsTestJobs = (context) => {
|
|
|
77
77
|
script: [
|
|
78
78
|
`cd ${context.build.dir}`,
|
|
79
79
|
...bundlerInstall,
|
|
80
|
-
...((_r = (0, utils_1.
|
|
80
|
+
...((_r = (0, utils_1.ensureArrayOrNull)((_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.command)) !== null && _r !== void 0 ? _r : [
|
|
81
81
|
"bundle exec rspec",
|
|
82
82
|
]),
|
|
83
83
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/test.ts"],"names":[],"mappings":";;;AAAA,6BAGe;AAEf,
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/test.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ const createSbomBuildJob = (context) => {
|
|
|
22
22
|
const script = (0, _1.isStandaloneBuildConfig)(buildConfig) &&
|
|
23
23
|
buildConfig.type === "custom" &&
|
|
24
24
|
buildConfig.sbom !== false
|
|
25
|
-
? (_d = (0, utils_1.
|
|
25
|
+
? (_d = (0, utils_1.ensureArrayOrNull)((_c = buildConfig.sbom) === null || _c === void 0 ? void 0 : _c.command)) !== null && _d !== void 0 ? _d : defaultScript
|
|
26
26
|
: defaultScript;
|
|
27
27
|
return {
|
|
28
28
|
name: exports.SBOM_BUILD_JOB_NAME,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbom.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/sbom.ts"],"names":[],"mappings":";;;AAAA,wBAA4C;AAG5C,
|
|
1
|
+
{"version":3,"file":"sbom.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/sbom.ts"],"names":[],"mappings":";;;AAAA,wBAA4C;AAG5C,oCAA6C;AAEhC,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,SAAS,GAAG,aAAa,CAAC;AAEhC,MAAM,kBAAkB,GAAG,CAAC,OAAyB,EAAgB,EAAE;;IAC5E,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,MAAM,YAAY,GAAG,sBAAsB,CAAC;IAC5C,MAAM,aAAa,GAAG;QACpB,iDAAiD,iBAAS,KACxD,OAAO,CAAC,kBAAkB,CAAC,sBAAsB;YAC/C,CAAC,CAAC,GAAG;YACL,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GACpB,EAAE;KACH,CAAC;IAEF,MAAM,KAAK,GACT,IAAA,0BAAuB,EAAC,WAAW,CAAC;QACpC,WAAW,CAAC,IAAI,KAAK,QAAQ;QAC7B,WAAW,CAAC,IAAI,KAAK,KAAK;QACxB,CAAC,CAAC,MAAA,MAAA,WAAW,CAAC,IAAI,0CAAE,QAAQ,mCAAI,YAAY;QAC5C,CAAC,CAAC,YAAY,CAAC;IAEnB,MAAM,MAAM,GACV,IAAA,0BAAuB,EAAC,WAAW,CAAC;QACpC,WAAW,CAAC,IAAI,KAAK,QAAQ;QAC7B,WAAW,CAAC,IAAI,KAAK,KAAK;QACxB,CAAC,CAAC,MAAA,IAAA,yBAAiB,EAAC,MAAA,WAAW,CAAC,IAAI,0CAAE,OAAO,CAAC,mCAAI,aAAa;QAC/D,CAAC,CAAC,aAAa,CAAC;IAEpB,OAAO;QACL,IAAI,EAAE,2BAAmB;QACzB,KAAK,EAAE,OAAO;QACd,OAAO,EAAE,WAAW;QACpB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE,SAAS;QAChB,KAAK;QACL,MAAM;QACN,aAAa,EAAE,IAAI;QACnB,SAAS,EAAE;YACT,KAAK,EAAE,CAAC,iBAAS,CAAC;SACnB;KACF,CAAC;AACJ,CAAC,CAAC;AAvCW,QAAA,kBAAkB,sBAuC7B"}
|
|
@@ -1,6 +1,35 @@
|
|
|
1
1
|
import type { Artifacts, EnvVars, GitlabJobImage } from "../types";
|
|
2
2
|
import type { Services } from "../types/gitlab-ci-yml";
|
|
3
|
-
import type { CatladderJob } from "../types/jobs";
|
|
3
|
+
import type { CatladderJob, CatladderJobCache } from "../types/jobs";
|
|
4
|
+
export type CacheConfigAdvanced = Omit<CatladderJobCache, "paths" | "key"> & {
|
|
5
|
+
/**
|
|
6
|
+
* if you set a key, the cache is scoped to the key. Be aware that there is a limit in gitlab of 4 caches.
|
|
7
|
+
*
|
|
8
|
+
* see https://gitlab.com/gitlab-org/gitlab/-/issues/421962
|
|
9
|
+
*/
|
|
10
|
+
key: Required<CatladderJobCache>["key"];
|
|
11
|
+
/**
|
|
12
|
+
* whether the cache is scoped to the context (component or workspace) or the build directory.
|
|
13
|
+
*
|
|
14
|
+
* defaults to context
|
|
15
|
+
*/
|
|
16
|
+
scope?: "context" | "buildDir" | "global";
|
|
17
|
+
} & CacheConfigSimple;
|
|
18
|
+
export type CacheConfigSimple = {
|
|
19
|
+
/**
|
|
20
|
+
* paths to cache. All Paths are relative to the context dir.
|
|
21
|
+
*/
|
|
22
|
+
paths: string[];
|
|
23
|
+
/**
|
|
24
|
+
* whether paths are relative to the base dir. defaults to relative.
|
|
25
|
+
*/
|
|
26
|
+
pathMode?: "relative" | "absolute";
|
|
27
|
+
/**
|
|
28
|
+
* custom base dir
|
|
29
|
+
*/
|
|
30
|
+
baseDir?: string;
|
|
31
|
+
};
|
|
32
|
+
export type CacheConfig = CacheConfigSimple | CacheConfigAdvanced;
|
|
4
33
|
export type BuildConfigArtifactsReports = {
|
|
5
34
|
/**
|
|
6
35
|
* The junit report collects JUnit report format XML files.
|
|
@@ -10,6 +39,9 @@ export type BuildConfigArtifactsReports = {
|
|
|
10
39
|
*/
|
|
11
40
|
junit?: string[];
|
|
12
41
|
};
|
|
42
|
+
export type WithCacheConfig = {
|
|
43
|
+
cache?: CacheConfig | CacheConfig[];
|
|
44
|
+
};
|
|
13
45
|
export type TestJobCustom = {
|
|
14
46
|
command?: string | string[];
|
|
15
47
|
jobImage?: GitlabJobImage;
|
|
@@ -75,6 +107,8 @@ export type BuildConfigBase = {
|
|
|
75
107
|
artifactsReports?: BuildConfigArtifactsReports;
|
|
76
108
|
/**
|
|
77
109
|
* customize cache for the job
|
|
110
|
+
*
|
|
111
|
+
* @deprecated use cache
|
|
78
112
|
*/
|
|
79
113
|
jobCache?: CatladderJob["cache"];
|
|
80
114
|
/**
|
|
@@ -85,7 +119,7 @@ export type BuildConfigBase = {
|
|
|
85
119
|
* custom image to use
|
|
86
120
|
*/
|
|
87
121
|
jobImage?: GitlabJobImage;
|
|
88
|
-
};
|
|
122
|
+
} & WithCacheConfig;
|
|
89
123
|
export type BuildConfigNodeBase = BuildConfigBase & {
|
|
90
124
|
/**
|
|
91
125
|
* runs a command after yarn install. postinstall in package.json won't work for yarn plug and play.
|
|
@@ -239,7 +273,7 @@ export type BuildConfigFromWorkspace = {
|
|
|
239
273
|
* by default "dist" and ".next" are allways included
|
|
240
274
|
*/
|
|
241
275
|
artifactsPaths?: string[];
|
|
242
|
-
};
|
|
276
|
+
} & WithCacheConfig;
|
|
243
277
|
export type BuildConfigStandalone = BuildConfigNode | BuildConfigNodeStatic | BuildConfigStorybook | BuildConfigMeteor | BuildConfigCustom | BuildConfigRails;
|
|
244
278
|
export type BuildConfig = BuildConfigFromWorkspace | BuildConfigStandalone;
|
|
245
279
|
export type BuildConfigStandaloneType = BuildConfigStandalone["type"];
|
|
@@ -285,7 +319,12 @@ export type WorkspaceBuildConfigBase = {
|
|
|
285
319
|
* use to display information in merge requests, pipeline views and security dashboards.
|
|
286
320
|
*/
|
|
287
321
|
artifactsReports?: BuildConfigArtifactsReports;
|
|
288
|
-
|
|
322
|
+
jobImage?: GitlabJobImage;
|
|
323
|
+
/**
|
|
324
|
+
* tags for the underlying job runner (e.g gitlab)
|
|
325
|
+
*/
|
|
326
|
+
jobTags?: string[];
|
|
327
|
+
} & WithCacheConfig;
|
|
289
328
|
export type WorkspaceBuildConfigNode = {
|
|
290
329
|
type: "node";
|
|
291
330
|
buildCommand?: string | string[];
|
|
@@ -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":";;;AAkWO,MAAM,uBAAuB,GAAG,CACrC,CAAsB,EACM,EAAE;IAC9B,IAAI,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACrB,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;AACxB,CAAC,CAAC;AALW,QAAA,uBAAuB,2BAKlC;AAEK,MAAM,aAAa,GAAG,CAC3B,CAAc,EACd,GAAG,KAAQ,EACqC,EAAE;IAClD,IAAI,CAAC,IAAA,+BAAuB,EAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9C,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC;AANW,QAAA,aAAa,iBAMxB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type { Artifacts as GitlabCiArtifacts, JobTemplate, Cache, Rules } from "./gitlab-ci-yml";
|
|
1
|
+
import type { Artifacts as GitlabCiArtifacts, JobTemplate, Cache as GitlabJobCache, Rules } from "./gitlab-ci-yml";
|
|
2
2
|
export { Retry, Image as GitlabJobImage } from "./gitlab-ci-yml";
|
|
3
3
|
export type Artifacts = GitlabCiArtifacts;
|
|
4
|
-
export type GitlabJobCache
|
|
4
|
+
export type { GitlabJobCache };
|
|
5
5
|
export type GitlabRule = Exclude<Exclude<Rules, null>[number], string | string[]>;
|
|
6
6
|
export type GitlabEnvironment = Omit<Exclude<JobTemplate["environment"], undefined | string>, "deployment_tier">;
|
|
7
7
|
export interface GitlabJobDef extends Pick<JobTemplate, "after_script" | "allow_failure" | "artifacts" | "before_script" | "coverage" | "dependencies" | "environment" | "except" | "hooks" | "image" | "interruptible" | "needs" | "only" | "parallel" | "release" | "resource_group" | "retry" | "rules" | "script" | "services" | "stage" | "tags" | "trigger" | "variables"> {
|
|
@@ -17,5 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
17
17
|
__exportStar(require("./config"), exports);
|
|
18
18
|
__exportStar(require("./gitlab-types"), exports);
|
|
19
19
|
__exportStar(require("./context"), exports);
|
|
20
|
+
__exportStar(require("./jobDefinition"), exports);
|
|
20
21
|
__exportStar(require("./pipeline"), exports);
|
|
21
22
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,iDAA+B;AAC/B,4CAA0B;AAC1B,6CAA2B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,iDAA+B;AAC/B,4CAA0B;AAC1B,kDAAgC;AAChC,6CAA2B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jobDefinition.js","sourceRoot":"","sources":["../../../../../pipeline/src/types/jobDefinition.ts"],"names":[],"mappings":""}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { UnspecifiedEnvVars } from "..";
|
|
2
|
-
import type { Artifacts, GitlabJobCache,
|
|
2
|
+
import type { Artifacts, GitlabEnvironment, GitlabJobCache, GitlabJobDef, GitlabJobImage, GitlabRule } from "./gitlab-types";
|
|
3
|
+
export type CatladderJobCache = GitlabJobCache;
|
|
3
4
|
export declare const BASE_STAGES: readonly ["setup", "test", "build", "deploy", "verify", "rollback", "stop"];
|
|
4
5
|
export type BaseStage = (typeof BASE_STAGES)[number];
|
|
5
6
|
export type CatladderJobNeed = string | {
|
|
@@ -62,7 +63,7 @@ export type CatladderJob<S = BaseStage> = {
|
|
|
62
63
|
/**
|
|
63
64
|
* cache config, we use here the same shape as gitlab itself
|
|
64
65
|
*/
|
|
65
|
-
cache?:
|
|
66
|
+
cache?: CatladderJobCache | CatladderJobCache[];
|
|
66
67
|
/**
|
|
67
68
|
* job artifacts, we also use gitlab shape here
|
|
68
69
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobs.js","sourceRoot":"","sources":["../../../../../pipeline/src/types/jobs.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"jobs.js","sourceRoot":"","sources":["../../../../../pipeline/src/types/jobs.ts"],"names":[],"mappings":";;;AAWa,QAAA,WAAW,GAAG;IACzB,OAAO;IACP,MAAM;IACN,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,UAAU;IACV,MAAM;CACE,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export declare function notNil<TValue>(value: TValue | null | undefined): value is TValue;
|
|
2
|
-
export declare const
|
|
2
|
+
export declare const ensureArrayOrNull: <T>(s: undefined | T | T[]) => T[] | null;
|
|
3
|
+
export declare const ensureArray: <T>(s: undefined | T | T[]) => T[];
|
|
3
4
|
export declare const mergeWithMergingArrays: <A, B>(obj1: A, obj2: B) => A & B;
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mergeWithMergingArrays = exports.ensureArray = exports.notNil = void 0;
|
|
3
|
+
exports.mergeWithMergingArrays = exports.ensureArray = exports.ensureArrayOrNull = exports.notNil = void 0;
|
|
4
4
|
const lodash_1 = require("lodash");
|
|
5
5
|
function notNil(value) {
|
|
6
6
|
return value !== null && value !== undefined;
|
|
7
7
|
}
|
|
8
8
|
exports.notNil = notNil;
|
|
9
|
-
const
|
|
9
|
+
const ensureArrayOrNull = (s) => (0, lodash_1.isNil)(s) ? null : Array.isArray(s) ? s : [s];
|
|
10
|
+
exports.ensureArrayOrNull = ensureArrayOrNull;
|
|
11
|
+
const ensureArray = (s) => { var _a; return (_a = (0, exports.ensureArrayOrNull)(s)) !== null && _a !== void 0 ? _a : []; };
|
|
10
12
|
exports.ensureArray = ensureArray;
|
|
11
13
|
// see https://github.com/lodash/lodash/issues/5384
|
|
12
14
|
const mergeWithMergingArrays = (obj1, obj2) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/utils/index.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAE1C,SAAgB,MAAM,CACpB,KAAgC;IAEhC,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC;AAC/C,CAAC;AAJD,wBAIC;AAEM,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/utils/index.ts"],"names":[],"mappings":";;;AAAA,mCAA0C;AAE1C,SAAgB,MAAM,CACpB,KAAgC;IAEhC,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC;AAC/C,CAAC;AAJD,wBAIC;AAEM,MAAM,iBAAiB,GAAG,CAAI,CAAsB,EAAc,EAAE,CACzE,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AADlC,QAAA,iBAAiB,qBACiB;AAExC,MAAM,WAAW,GAAG,CAAI,CAAsB,EAAO,EAAE,WAC5D,OAAA,MAAA,IAAA,yBAAiB,EAAC,CAAC,CAAC,mCAAI,EAAE,CAAA,EAAA,CAAC;AADhB,QAAA,WAAW,eACK;AAE7B,mDAAmD;AAC5C,MAAM,sBAAsB,GAAG,CAAO,IAAO,EAAE,IAAO,EAAS,EAAE;IACtE,OAAO,IAAA,kBAAS,EAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAChD,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAC1C,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC;QACtB,CAAC,CAAC,SAAS,CACd,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,sBAAsB,0BAMjC"}
|