@catladder/cli 1.150.1 → 1.150.3
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 +1 -1
- package/dist/bundles/cli/index.js +1 -1
- package/dist/cli/src/catenv.js +0 -2
- package/dist/cli/src/catenv.js.map +1 -1
- package/dist/pipeline/src/build/base/createAppBuildJob.js +1 -1
- package/dist/pipeline/src/build/base/createAppBuildJob.js.map +1 -1
- package/dist/pipeline/src/build/node/buildJob.js +6 -7
- package/dist/pipeline/src/build/node/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/node/cache.d.ts +4 -4
- package/dist/pipeline/src/build/node/cache.js +5 -5
- package/dist/pipeline/src/build/node/cache.js.map +1 -1
- package/dist/pipeline/src/build/node/meteor.js +2 -2
- package/dist/pipeline/src/build/node/meteor.js.map +1 -1
- package/dist/pipeline/src/build/node/testJob.js +4 -4
- package/dist/pipeline/src/build/node/testJob.js.map +1 -1
- package/dist/pipeline/src/build/node/yarn.d.ts +4 -4
- package/dist/pipeline/src/build/node/yarn.js +3 -1
- package/dist/pipeline/src/build/node/yarn.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/context/createComponentContext.js +1 -1
- package/dist/pipeline/src/context/createComponentContext.js.map +1 -1
- package/dist/pipeline/src/deploy/custom/deployJob.js +1 -1
- package/dist/pipeline/src/deploy/custom/deployJob.js.map +1 -1
- package/dist/pipeline/src/pipeline/createAllJobs.d.ts +6 -6
- package/dist/pipeline/src/pipeline/createAllJobs.js +7 -19
- package/dist/pipeline/src/pipeline/createAllJobs.js.map +1 -1
- package/dist/pipeline/src/pipeline/createMainPipeline.js +2 -2
- package/dist/pipeline/src/pipeline/createMainPipeline.js.map +1 -1
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.d.ts +4 -4
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js +26 -24
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js.map +1 -1
- package/dist/pipeline/src/types/context.d.ts +2 -11
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/catenv.ts +0 -2
package/dist/cli/src/catenv.js
CHANGED
|
@@ -6,9 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
var catenv_1 = __importDefault(require("./apps/catenv/catenv"));
|
|
7
7
|
var parseChoice_1 = require("./config/parseChoice");
|
|
8
8
|
var choice = process.argv[2] ? (0, parseChoice_1.parseChoice)(process.argv[2]) : null;
|
|
9
|
-
var now = performance.now();
|
|
10
9
|
(0, catenv_1.default)(choice).then(function () {
|
|
11
|
-
console.log("catenv", performance.now() - now);
|
|
12
10
|
// we have to exit manually, because we have some file watches
|
|
13
11
|
process.exit();
|
|
14
12
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../src/catenv.ts"],"names":[],"mappings":";;;;;AAAA,gEAA0C;AAE1C,oDAAmD;AAEnD,IAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAErE,
|
|
1
|
+
{"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../src/catenv.ts"],"names":[],"mappings":";;;;;AAAA,gEAA0C;AAE1C,oDAAmD;AAEnD,IAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAErE,IAAA,gBAAM,EAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAClB,8DAA8D;IAC9D,OAAO,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC,CAAC,CAAC"}
|
|
@@ -70,7 +70,7 @@ var createAppBuildJob = function (context, _a) {
|
|
|
70
70
|
runnerVariables: __assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), (runnerVariables !== null && runnerVariables !== void 0 ? runnerVariables : {})), ((_c = context.build.config.runnerVariables) !== null && _c !== void 0 ? _c : {})),
|
|
71
71
|
script: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(((0, writeDotEnv_1.componentContextNeedsBuildTimeDotEnv)(context)
|
|
72
72
|
? (0, writeDotEnv_1.writeDotEnv)(context)
|
|
73
|
-
: [])), false), __read((0, writeBuildInfo_1.writeBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(context
|
|
73
|
+
: [])), false), __read((0, writeBuildInfo_1.writeBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(context)), false), [
|
|
74
74
|
"cd ".concat(context.build.dir)
|
|
75
75
|
], false), __read(((_d = (0, utils_1.ensureArray)(script)) !== null && _d !== void 0 ? _d : [])), false),
|
|
76
76
|
artifacts: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA+B;AAC/B,6BAA4B;AAE5B,2BAAuC;AAEvC,qCAA0C;AAC1C,qCAAiD;AACjD,yCAGqB;AACrB,mDAAkD;AAClD,6CAGuB;AAGhB,IAAM,iBAAiB,GAAG,UAC/B,OAAyB,EACzB,EAAqE;;IAAnE,IAAA,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,eAAe,qBAAA,EAAK,GAAG,cAA5C,0CAA8C,CAAF;IAE5C,OAAO,IAAA,cAAK,EACV;QACE,IAAI,EAAE,8BAAkB;QACxB,OAAO,EAAE,WAAW;QACpB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,IAAA,kBAAc,EAAC,cAAc,CAAC;QACrC,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,EAAE;QACT,SAAS,0CACJ,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC,GACjB,OAAO,CAAC,WAAW,CAAC,OAAO,GAC3B,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,GAC7C,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC,CAC1C;QACD,eAAe,iCACV,2CAA+B,GAC/B,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC,GACvB,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,mCAAI,EAAE,CAAC,CAChD;QAED,MAAM,mFACD,CAAC,IAAA,kDAAoC,EAAC,OAAO,CAAC;YAC/C,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;YACtB,CAAC,CAAC,EAAE,CAAC,kBACJ,IAAA,+BAAc,EAAC,OAAO,CAAC,kBACvB,IAAA,wBAAiB,EAAC,OAAO,CAAC
|
|
1
|
+
{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA+B;AAC/B,6BAA4B;AAE5B,2BAAuC;AAEvC,qCAA0C;AAC1C,qCAAiD;AACjD,yCAGqB;AACrB,mDAAkD;AAClD,6CAGuB;AAGhB,IAAM,iBAAiB,GAAG,UAC/B,OAAyB,EACzB,EAAqE;;IAAnE,IAAA,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,eAAe,qBAAA,EAAK,GAAG,cAA5C,0CAA8C,CAAF;IAE5C,OAAO,IAAA,cAAK,EACV;QACE,IAAI,EAAE,8BAAkB;QACxB,OAAO,EAAE,WAAW;QACpB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,IAAA,kBAAc,EAAC,cAAc,CAAC;QACrC,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,EAAE;QACT,SAAS,0CACJ,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC,GACjB,OAAO,CAAC,WAAW,CAAC,OAAO,GAC3B,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,GAC7C,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC,CAC1C;QACD,eAAe,iCACV,2CAA+B,GAC/B,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC,GACvB,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,mCAAI,EAAE,CAAC,CAChD;QAED,MAAM,mFACD,CAAC,IAAA,kDAAoC,EAAC,OAAO,CAAC;YAC/C,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;YACtB,CAAC,CAAC,EAAE,CAAC,kBACJ,IAAA,+BAAc,EAAC,OAAO,CAAC,kBACvB,IAAA,wBAAiB,EAAC,OAAO,CAAC;YAC7B,aAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAE;0BACtB,CAAC,MAAA,IAAA,mBAAW,EAAC,MAAM,CAAC,mCAAI,EAAE,CAAC,SAC/B;QACD,SAAS,EAAE;YACT,KAAK,EAAE,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;YACrD,OAAO,EAAE;gBACP,KAAK,EAAE,MAAA,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAgB,0CAAE,KAAK,0CAAE,GAAG,CAAC,UAAC,CAAC;oBACzD,OAAA,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBAA1B,CAA0B,CAC3B;aACF;SACF;KACF,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AA5CW,QAAA,iBAAiB,qBA4C5B"}
|
|
@@ -42,19 +42,18 @@ var createNodeBuildJobs = function (context) {
|
|
|
42
42
|
throw new Error("deploy config is not node, node-static or storybook");
|
|
43
43
|
}
|
|
44
44
|
var defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
|
|
45
|
-
var yarnInstall = (0, yarn_1.getYarnInstall)(context
|
|
45
|
+
var yarnInstall = (0, yarn_1.getYarnInstall)(context);
|
|
46
46
|
return (0, base_1.createBuildJobs)(context, {
|
|
47
47
|
appBuild: buildConfig.buildCommand !== null
|
|
48
48
|
? {
|
|
49
49
|
image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
|
|
50
50
|
runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
|
|
51
|
-
cache: __spreadArray(__spreadArray(__spreadArray([], __read(((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : [])), false), __read((0, cache_1.getNodeCache)(context
|
|
51
|
+
cache: __spreadArray(__spreadArray(__spreadArray([], __read(((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : [])), false), __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
|
|
52
52
|
script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read(((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : [])), false),
|
|
53
53
|
artifacts: {
|
|
54
54
|
paths: __spreadArray([
|
|
55
55
|
context.build.dir
|
|
56
|
-
], __read(((_d = context.
|
|
57
|
-
.currentWorkspaceDependencies) !== null && _d !== void 0 ? _d : [])), false).flatMap(function (dir) {
|
|
56
|
+
], __read(((_d = context.packageManagerInfo.currentWorkspaceDependencies) !== null && _d !== void 0 ? _d : [])), false).flatMap(function (dir) {
|
|
58
57
|
var _a, _b;
|
|
59
58
|
return __spreadArray([
|
|
60
59
|
(0, path_1.join)(dir, "__build_info.json"),
|
|
@@ -74,11 +73,11 @@ var createNodeBuildJobs = function (context) {
|
|
|
74
73
|
script: (0, docker_1.getDockerBuildScriptWithBuiltInDockerFile)(context, buildConfig.type === "node-static" || buildConfig.type === "storybook"
|
|
75
74
|
? "nginx"
|
|
76
75
|
: "node"),
|
|
77
|
-
cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context
|
|
76
|
+
cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
|
|
78
77
|
variables: {
|
|
79
78
|
// only required for non static
|
|
80
|
-
DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context
|
|
81
|
-
DOCKER_COPY_WORKSPACE_FILES: (_e = context.
|
|
79
|
+
DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
|
|
80
|
+
DOCKER_COPY_WORKSPACE_FILES: (_e = context.packageManagerInfo.pathsToCopyInDocker
|
|
82
81
|
.map(function (dir) { return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir); })) === null || _e === void 0 ? void 0 : _e.join("\n"),
|
|
83
82
|
},
|
|
84
83
|
},
|
|
@@ -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,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,
|
|
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,CAAC;IAE5C,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,kBACrB,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,OAAO,CAAC,kBAAkB,CAAC,4BAA4B,mCACzD,EAAE,CAAC,UACL,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,EAAE,MAAM,CAAC,SAAC;YACzC,SAAS,EAAE;gBACT,+BAA+B;gBAC/B,2BAA2B,EAAE,IAAA,qCAA8B,EAAC,OAAO,CAAC;gBACpE,2BAA2B,EACzB,MAAA,OAAO,CAAC,kBAAkB,CAAC,mBAAmB;qBAC3C,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;AAlEW,QAAA,mBAAmB,uBAkE9B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ComponentContext, Context } from "../../types/context";
|
|
2
2
|
import type { GitlabJobCache } from "../../types/gitlab-types";
|
|
3
|
-
export declare const getYarnCache: (context:
|
|
4
|
-
export declare const getNodeModulesCache: (context:
|
|
5
|
-
export declare const getNodeCache: (context:
|
|
3
|
+
export declare const getYarnCache: (context: Context, policy?: string) => GitlabJobCache[];
|
|
4
|
+
export declare const getNodeModulesCache: (context: Context, policy?: string) => GitlabJobCache[];
|
|
5
|
+
export declare const getNodeCache: (context: Context, policy?: string) => GitlabJobCache[];
|
|
6
6
|
export declare const getNextCache: (context: ComponentContext) => GitlabJobCache[];
|
|
@@ -29,9 +29,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
29
29
|
};
|
|
30
30
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
31
|
exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
|
|
32
|
+
var lodash_1 = require("lodash");
|
|
32
33
|
var path_1 = require("path");
|
|
33
34
|
var slugify_1 = __importDefault(require("slugify"));
|
|
34
|
-
var lodash_1 = require("lodash");
|
|
35
35
|
var getYarnCache = function (context, policy) {
|
|
36
36
|
if (policy === void 0) { policy = "pull-push"; }
|
|
37
37
|
var componentIsInWorkspace = context.packageManagerInfo.componentIsInWorkspace;
|
|
@@ -43,9 +43,9 @@ var getYarnCache = function (context, policy) {
|
|
|
43
43
|
paths: [".yarn"],
|
|
44
44
|
}
|
|
45
45
|
: {
|
|
46
|
-
key: (0, slugify_1.default)(context.dir) + "-yarn",
|
|
46
|
+
key: (0, slugify_1.default)(context.build.dir) + "-yarn",
|
|
47
47
|
policy: policy,
|
|
48
|
-
paths: [(0, path_1.join)(context.dir, ".yarn")],
|
|
48
|
+
paths: [(0, path_1.join)(context.build.dir, ".yarn")],
|
|
49
49
|
},
|
|
50
50
|
];
|
|
51
51
|
};
|
|
@@ -61,7 +61,7 @@ var getNodeModulesCache = function (context, policy) {
|
|
|
61
61
|
// if component is in a shared workspace, use workspace cache. use individual cache else
|
|
62
62
|
key: componentIsInWorkspace
|
|
63
63
|
? "node-modules-workspace"
|
|
64
|
-
: (0, slugify_1.default)(context.dir) + "-node-modules", // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
|
|
64
|
+
: (0, slugify_1.default)(context.build.dir) + "-node-modules", // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
|
|
65
65
|
policy: policy,
|
|
66
66
|
paths: __spreadArray([], __read((componentIsInWorkspace
|
|
67
67
|
? (0, lodash_1.uniq)(__spreadArray([
|
|
@@ -69,7 +69,7 @@ var getNodeModulesCache = function (context, policy) {
|
|
|
69
69
|
], __read(((_a = context.packageManagerInfo.workspaces.map(function (w) {
|
|
70
70
|
return (0, path_1.join)(w.location, "node_modules");
|
|
71
71
|
})) !== null && _a !== void 0 ? _a : [])), false))
|
|
72
|
-
: [(0, path_1.join)(context.dir, "node_modules")])), false),
|
|
72
|
+
: [(0, path_1.join)(context.build.dir, "node_modules")])), false),
|
|
73
73
|
},
|
|
74
74
|
];
|
|
75
75
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/cache.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,oDAA8B;
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/cache.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA8B;AAC9B,6BAA4B;AAC5B,oDAA8B;AAIvB,IAAM,YAAY,GAAG,UAC1B,OAAgB,EAChB,MAAoB;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,IAAM,sBAAsB,GAC1B,OAAO,CAAC,kBAAkB,CAAC,sBAAsB,CAAC;IACpD,OAAO;QACL,sBAAsB;YACpB,CAAC,CAAC;gBACE,GAAG,EAAE,MAAM;gBACX,MAAM,QAAA;gBACN,KAAK,EAAE,CAAC,OAAO,CAAC;aACjB;YACH,CAAC,CAAC;gBACE,GAAG,EAAE,IAAA,iBAAO,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO;gBACzC,MAAM,QAAA;gBACN,KAAK,EAAE,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;aAC1C;KACN,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,YAAY,gBAmBvB;AAEK,IAAM,mBAAmB,GAAG,UACjC,OAAgB,EAChB,MAAoB;;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,IAAM,sBAAsB,GAC1B,OAAO,CAAC,kBAAkB,CAAC,sBAAsB,CAAC;IAEpD,uNAAuN;IACvN,0HAA0H;IAC1H,OAAO;QACL;YACE,wFAAwF;YACxF,GAAG,EAAE,sBAAsB;gBACzB,CAAC,CAAC,wBAAwB;gBAC1B,CAAC,CAAC,IAAA,iBAAO,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,eAAe,EAAE,+LAA+L;YACjP,MAAM,QAAA;YACN,KAAK,2BACA,CAAC,sBAAsB;gBACxB,CAAC,CAAC,IAAA,aAAI;oBACF,cAAc;0BACX,CAAC,MAAA,OAAO,CAAC,kBAAkB,CAAC,UAAU,CAAC,GAAG,CAAC,UAAC,CAAC;oBAC9C,OAAA,IAAA,WAAI,EAAC,CAAC,CAAC,QAAQ,EAAE,cAAc,CAAC;gBAAhC,CAAgC,CACjC,mCAAI,EAAE,CAAC,UACR;gBACJ,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC,SAC/C;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AA5BW,QAAA,mBAAmB,uBA4B9B;AACK,IAAM,YAAY,GAAG,UAC1B,OAAgB,EAChB,MAAoB;IAApB,uBAAA,EAAA,oBAAoB;IAEpB,8CACK,IAAA,oBAAY,EAAC,OAAO,EAAE,MAAM,CAAC,kBAC7B,IAAA,2BAAmB,EAAC,OAAO,EAAE,MAAM,CAAC,UACvC;AACJ,CAAC,CAAC;AARW,QAAA,YAAY,gBAQvB;AAEK,IAAM,YAAY,GAAG,UAAC,OAAyB,IAAuB,OAAA;IAC3E;QACE,GAAG,EAAE,OAAO,CAAC,aAAa,GAAG,aAAa;QAC1C,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,eAAe,CAAC;KAC7C;CACF,EAN4E,CAM5E,CAAC;AANW,QAAA,YAAY,gBAMvB"}
|
|
@@ -50,11 +50,11 @@ var createMeteorBuildJobs = function (context) {
|
|
|
50
50
|
if (!(0, types_1.isOfBuildType)(buildConfig, "meteor")) {
|
|
51
51
|
throw new Error("deploy config is not meteor");
|
|
52
52
|
}
|
|
53
|
-
var yarnInstall = (0, yarn_1.getYarnInstall)(context
|
|
53
|
+
var yarnInstall = (0, yarn_1.getYarnInstall)(context);
|
|
54
54
|
return (0, base_1.createBuildJobs)(context, {
|
|
55
55
|
appBuild: buildConfig.buildCommand !== null
|
|
56
56
|
? {
|
|
57
|
-
cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context
|
|
57
|
+
cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read(getMeteorCache(context)), false),
|
|
58
58
|
image: (0, runner_1.getRunnerImage)("jobs-meteor"),
|
|
59
59
|
variables: {
|
|
60
60
|
METEOR_DISABLE_OPTIMISTIC_CACHING: "1", // see https://forums.meteor.com/t/veeery-long-building-time-inside-docker-container/58673/17?u=macrozone
|
|
@@ -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,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,
|
|
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,CAAC;IAE5C,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,kBAAK,cAAc,CAAC,OAAO,CAAC,SAAC;gBAC7D,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"}
|
|
@@ -59,21 +59,21 @@ var createNodeTestJobs = function (context) {
|
|
|
59
59
|
needs: [],
|
|
60
60
|
envMode: "none",
|
|
61
61
|
};
|
|
62
|
-
var yarnInstall = (0, yarn_1.getYarnInstall)(context
|
|
62
|
+
var yarnInstall = (0, yarn_1.getYarnInstall)(context);
|
|
63
63
|
var auditJob = buildConfig.audit !== false
|
|
64
64
|
? __assign(__assign(__assign({ name: "🛡 audit" }, base), { image: (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : defaultImage, cache: undefined, script: __spreadArray([
|
|
65
65
|
"cd ".concat(context.build.dir)
|
|
66
66
|
], __read(((_e = (0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : [
|
|
67
|
-
context.
|
|
67
|
+
context.packageManagerInfo.isClassic
|
|
68
68
|
? "yarn audit"
|
|
69
69
|
: "yarn npm audit --environment production", // yarn 2
|
|
70
70
|
])), false), allow_failure: true }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_f = buildConfig.audit) === null || _f === void 0 ? void 0 : _f.artifactsReports, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.artifacts)) : null;
|
|
71
71
|
var lintJob = buildConfig.lint !== false
|
|
72
|
-
? __assign(__assign(__assign({ name: "👮 lint" }, base), { image: (_j = (_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.jobImage) !== null && _j !== void 0 ? _j : defaultImage, cache: (0, cache_1.getNodeCache)(context
|
|
72
|
+
? __assign(__assign(__assign({ name: "👮 lint" }, base), { image: (_j = (_h = buildConfig.lint) === null || _h === void 0 ? void 0 : _h.jobImage) !== null && _j !== void 0 ? _j : defaultImage, cache: (0, cache_1.getNodeCache)(context), script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), [
|
|
73
73
|
"cd ".concat(context.build.dir)
|
|
74
74
|
], false), __read(yarnInstall), false), __read(((_l = (0, utils_1.ensureArray)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : ["yarn lint"])), false) }), (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)) : null;
|
|
75
75
|
var testJob = buildConfig.test !== false
|
|
76
|
-
? __assign(__assign(__assign({ name: "🧪 test" }, base), { 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"), cache: (0, cache_1.getNodeCache)(context
|
|
76
|
+
? __assign(__assign(__assign({ name: "🧪 test" }, base), { 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"), cache: (0, cache_1.getNodeCache)(context), script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context)), false), [
|
|
77
77
|
"cd ".concat(context.build.dir)
|
|
78
78
|
], false), __read(yarnInstall), false), __read(((_s = (0, utils_1.ensureArray)((_r = buildConfig.test) === null || _r === void 0 ? void 0 : _r.command)) !== null && _s !== void 0 ? _s : ["yarn test"])), false) }), (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)) : null;
|
|
79
79
|
return [auditJob, lintJob, testJob].filter(utils_1.notNil);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/testJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAA8C;AAG9C,qCAAkD;AAClD,iCAAuC;AACvC,yCAA0D;AAC1D,+BAA2D;AAC3D,uEAAsE;AAE/D,IAAM,kBAAkB,GAAG,UAChC,OAAyB;;IAEzB,gCAAgC;IAChC,6CAA6C;IAC7C,IAAI,OAAO,CAAC,OAAO,KAAK,eAAe,EAAE,CAAC;QACxC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAM,YAAY,GAAG,IAAA,uBAAc,EAAC,cAAc,CAAC,CAAC;IACpD,IAAM,IAAI,GAA0C;QAClD,SAAS,sBACP,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,IACxB,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,GAC7C,CAAC,MAAA,WAAW,CAAC,SAAS,mCAAI,EAAE,CAAC,CACjC;QACD,eAAe,EAAE,uCAA2B;QAC5C,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,EAAE;QACT,OAAO,EAAE,MAAM;KAChB,CAAC;IACF,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/testJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { BashExpression } from "../../bash/BashExpression";
|
|
2
|
-
import type {
|
|
3
|
-
export declare const ensureNodeVersion: (context:
|
|
4
|
-
export declare const getYarnInstall: (context:
|
|
2
|
+
import type { Context } from "../../types";
|
|
3
|
+
export declare const ensureNodeVersion: (context: Context) => string[];
|
|
4
|
+
export declare const getYarnInstall: (context: Context, options?: {
|
|
5
5
|
noCustomPostInstall: boolean;
|
|
6
6
|
}) => string[];
|
|
7
|
-
export declare const getDockerAppCopyAndBuildScript: (context:
|
|
7
|
+
export declare const getDockerAppCopyAndBuildScript: (context: Context) => BashExpression;
|
|
@@ -47,7 +47,9 @@ var ensureNodeVersion = function (context) {
|
|
|
47
47
|
exports.ensureNodeVersion = ensureNodeVersion;
|
|
48
48
|
var getYarnInstall = function (context, options) {
|
|
49
49
|
var _a;
|
|
50
|
-
var postInstall = "postInstall" in context.
|
|
50
|
+
var postInstall = "postInstall" in context.build.config
|
|
51
|
+
? context.build.config.postInstall
|
|
52
|
+
: null;
|
|
51
53
|
return __spreadArray(__spreadArray(__spreadArray([], __read((0, exports.ensureNodeVersion)(context)), false), __read((0, gitlab_1.collapseableSection)("yarninstall", "Yarn install")([getYarnInstallCommand(context)])), false), __read((postInstall && !(options === null || options === void 0 ? void 0 : options.noCustomPostInstall)
|
|
52
54
|
? (0, gitlab_1.collapseableSection)("postinstall", "Custom post install")((_a = (0, utils_1.ensureArray)(postInstall)) !== null && _a !== void 0 ? _a : [])
|
|
53
55
|
: [])), false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/yarn.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA2D;AAE3D,qCAA0C;AAC1C,6CAAyD;AAEzD,IAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAE9D,8CAA8C;AAC9C,IAAM,uBAAuB,GAAG,oDAAoD,CAAC;AAErF,IAAM,qBAAqB,GAAG,UAAC,
|
|
1
|
+
{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/yarn.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA2D;AAE3D,qCAA0C;AAC1C,6CAAyD;AAEzD,IAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAE9D,8CAA8C;AAC9C,IAAM,uBAAuB,GAAG,oDAAoD,CAAC;AAErF,IAAM,qBAAqB,GAAG,UAAC,OAAgB;IAC7C,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,OAAO,0BAA0B,CAAC;AACpC,CAAC,CAAC;AAEK,IAAM,iBAAiB,GAAG,UAAC,OAAgB;IAChD,OAAA,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC;QACA,yDAAyD;QACzD,yEAAyE;KAC1E,CAAC;AANF,CAME,CAAC;AAPQ,QAAA,iBAAiB,qBAOzB;AAEE,IAAM,cAAc,GAAG,UAC5B,OAAgB,EAChB,OAEC;;IAED,IAAM,WAAW,GACf,aAAa,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM;QACnC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW;QAClC,CAAC,CAAC,IAAI,CAAC;IACX,4DACK,IAAA,yBAAiB,EAAC,OAAO,CAAC,kBAC1B,IAAA,4BAAmB,EACpB,aAAa,EACb,cAAc,CACf,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,kBAChC,CAAC,WAAW,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,CAAA;QAC9C,CAAC,CAAC,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,mCAAI,EAAE,CAAC;QACnC,CAAC,CAAC,EAAE,CAAC,UACP;AACJ,CAAC,CAAC;AAvBW,QAAA,cAAc,kBAuBzB;AAEF,IAAM,iBAAiB,GAAG,mCAAmC,CAAC;AAEvD,IAAM,8BAA8B,GAAG,UAAC,OAAgB;IAC7D,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,IAAI,+BAAc,CACvB,gBACA,oBAAoB,6CACxB,iBAAiB,mBACb,oBAAoB,yBACrB,CAAC,IAAI,EAAE,CACP,CAAC;IACJ,CAAC;IAED,wFAAwF;IACxF,8CAA8C;IAC9C,IAAM,6BAA6B,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,UAAC,CAAC;QACtD,OAAA,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IAAhD,CAAgD,CACjD,CAAC;IACF,IAAM,6BAA6B,GAAG,6BAA6B;QACjE,CAAC,CAAC,wCAAwC;QAC1C,CAAC,CAAC,EAAE,CAAC;IAEP,yCAAyC;IACzC,iGAAiG;IACjG,OAAO,IAAI,+BAAc,CACvB,YACF,iBAAiB,eACjB,6BAA6B,mBACzB,uBAAuB,aAExB,CAAC,IAAI,EAAE,CACT,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,8BAA8B,kCA8BzC"}
|
|
@@ -9,7 +9,7 @@ var createSbomBuildJob = function (context) {
|
|
|
9
9
|
var buildConfig = context.build.config;
|
|
10
10
|
var defaultImage = "aquasec/trivy:0.38.3";
|
|
11
11
|
var defaultScript = [
|
|
12
|
-
"trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(context.
|
|
12
|
+
"trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(context.packageManagerInfo.componentIsInWorkspace
|
|
13
13
|
? "."
|
|
14
14
|
: context.build.dir),
|
|
15
15
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbom.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/sbom.ts"],"names":[],"mappings":";;;AAEA,kCAAuC;AAE1B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,SAAS,GAAG,aAAa,CAAC;AAEhC,IAAM,kBAAkB,GAAG,UAAC,OAAyB;;IAC1D,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAM,YAAY,GAAG,sBAAsB,CAAC;IAC5C,IAAM,aAAa,GAAG;QACpB,yDAAiD,iBAAS,gBACxD,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"sbom.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/sbom.ts"],"names":[],"mappings":";;;AAEA,kCAAuC;AAE1B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,SAAS,GAAG,aAAa,CAAC;AAEhC,IAAM,kBAAkB,GAAG,UAAC,OAAyB;;IAC1D,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAM,YAAY,GAAG,sBAAsB,CAAC;IAC5C,IAAM,aAAa,GAAG;QACpB,yDAAiD,iBAAS,gBACxD,OAAO,CAAC,kBAAkB,CAAC,sBAAsB;YAC/C,CAAC,CAAC,GAAG;YACL,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CACrB;KACH,CAAC;IAEF,IAAM,KAAK,GACT,WAAW,CAAC,IAAI,KAAK,QAAQ,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK;QACzD,CAAC,CAAC,MAAA,MAAA,WAAW,CAAC,IAAI,0CAAE,QAAQ,mCAAI,YAAY;QAC5C,CAAC,CAAC,YAAY,CAAC;IAEnB,IAAM,MAAM,GACV,WAAW,CAAC,IAAI,KAAK,QAAQ,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK;QACzD,CAAC,CAAC,MAAA,IAAA,mBAAW,EAAC,MAAA,WAAW,CAAC,IAAI,0CAAE,OAAO,CAAC,mCAAI,aAAa;QACzD,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,OAAA;QACL,MAAM,QAAA;QACN,aAAa,EAAE,IAAI;QACnB,SAAS,EAAE;YACT,KAAK,EAAE,CAAC,iBAAS,CAAC;SACnB;KACF,CAAC;AACJ,CAAC,CAAC;AAnCW,QAAA,kBAAkB,sBAmC7B"}
|
|
@@ -85,9 +85,9 @@ var createComponentContext = function (ctx) { return __awaiter(void 0, void 0, v
|
|
|
85
85
|
context = {
|
|
86
86
|
fullConfig: ctx.config,
|
|
87
87
|
componentConfig: componentConfig,
|
|
88
|
+
env: ctx.env,
|
|
88
89
|
build: {
|
|
89
90
|
dir: dir,
|
|
90
|
-
packageManagerInfo: packageManagerInfo,
|
|
91
91
|
config: build,
|
|
92
92
|
},
|
|
93
93
|
deploy: deploy
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createComponentContext.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/createComponentContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAoC;AACpC,kCAAuC;AAEvC,oCAAyC;AAMzC,kCAAkD;AAClD,mDAAkD;AAClD,iEAAgE;AAChE,6DAA+E;AAUxE,IAAM,sBAAsB,GAAG,UACpC,GAAkC;;;;;gBAElC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;oBAC5C,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAC;gBACJ,CAAC;gBAE0B,qBAAM,IAAA,kDAAiC,EAChE,GAAG,CAAC,MAAM,EACV,GAAG,CAAC,aAAa,CAClB,EAAA;;gBAHK,kBAAkB,GAAG,SAG1B;gBAEK,UAAU,GAAG,IAAA,6CAAqB,EAAC,GAAG,CAAC,CAAC;gBAExC,8BAA8B,GAAG,UAAU,CAAC,YAAY,CAAC;gBACzD,QAAQ,GAGV,8BAA8B,CAAC,MAAM;oBACvC,CAAC,CAAC;wBACE,KAAK,EACH,mBAAW,CACT,8BAA8B,CAAC,KAAK,CAAC,IAAuB,CAC7D,CAAC,QAAQ,CAAC,UAAU,CAAC;wBACxB,MAAM,EAAE,qBAAY,CAClB,8BAA8B,CAAC,MAAM,CAAC,IAAwB,CAC/D,CAAC,QAAQ,CAAC,UAAiB,CAAC;qBAC9B;oBACH,CAAC,CAAC;wBACE,KAAK,EAAE,EAAE;wBACT,MAAM,EAAE,EAAE;qBACX,CAAC;gBACA,eAAe,GAAG,IAAA,8BAAsB,EAC5C,QAAQ,EACR,8BAA8B,CAC/B,CAAC;gBAEkB,qBAAM,IAAA,+BAAc,EAAC,GAAG,CAAC,EAAA;;gBAAvC,WAAW,GAAG,SAAyB;gBACrC,MAAM,GAA6B,eAAe,OAA5C,EAAE,KAAK,GAAsB,eAAe,MAArC,EAAE,UAAU,GAAU,eAAe,WAAzB,EAAE,GAAG,GAAK,eAAe,IAApB,CAAqB;gBACrD,OAAO,GAAyC;oBACpD,UAAU,EAAE,GAAG,CAAC,MAAM;oBACtB,eAAe,iBAAA;
|
|
1
|
+
{"version":3,"file":"createComponentContext.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/createComponentContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAoC;AACpC,kCAAuC;AAEvC,oCAAyC;AAMzC,kCAAkD;AAClD,mDAAkD;AAClD,iEAAgE;AAChE,6DAA+E;AAUxE,IAAM,sBAAsB,GAAG,UACpC,GAAkC;;;;;gBAElC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;oBAC5C,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAC;gBACJ,CAAC;gBAE0B,qBAAM,IAAA,kDAAiC,EAChE,GAAG,CAAC,MAAM,EACV,GAAG,CAAC,aAAa,CAClB,EAAA;;gBAHK,kBAAkB,GAAG,SAG1B;gBAEK,UAAU,GAAG,IAAA,6CAAqB,EAAC,GAAG,CAAC,CAAC;gBAExC,8BAA8B,GAAG,UAAU,CAAC,YAAY,CAAC;gBACzD,QAAQ,GAGV,8BAA8B,CAAC,MAAM;oBACvC,CAAC,CAAC;wBACE,KAAK,EACH,mBAAW,CACT,8BAA8B,CAAC,KAAK,CAAC,IAAuB,CAC7D,CAAC,QAAQ,CAAC,UAAU,CAAC;wBACxB,MAAM,EAAE,qBAAY,CAClB,8BAA8B,CAAC,MAAM,CAAC,IAAwB,CAC/D,CAAC,QAAQ,CAAC,UAAiB,CAAC;qBAC9B;oBACH,CAAC,CAAC;wBACE,KAAK,EAAE,EAAE;wBACT,MAAM,EAAE,EAAE;qBACX,CAAC;gBACA,eAAe,GAAG,IAAA,8BAAsB,EAC5C,QAAQ,EACR,8BAA8B,CAC/B,CAAC;gBAEkB,qBAAM,IAAA,+BAAc,EAAC,GAAG,CAAC,EAAA;;gBAAvC,WAAW,GAAG,SAAyB;gBACrC,MAAM,GAA6B,eAAe,OAA5C,EAAE,KAAK,GAAsB,eAAe,MAArC,EAAE,UAAU,GAAU,eAAe,WAAzB,EAAE,GAAG,GAAK,eAAe,IAApB,CAAqB;gBACrD,OAAO,GAAyC;oBACpD,UAAU,EAAE,GAAG,CAAC,MAAM;oBACtB,eAAe,iBAAA;oBACf,GAAG,EAAE,GAAG,CAAC,GAAG;oBAEZ,KAAK,EAAE;wBACL,GAAG,EAAE,GAAG;wBACR,MAAM,EAAE,KAAK;qBACd;oBACD,MAAM,EAAE,MAAM;wBACZ,CAAC,CAAC;4BACE,MAAM,EAAE,MAAM;yBACf;wBACH,CAAC,CAAC,IAAI;oBACR,aAAa,EAAE,GAAG,CAAC,aAAa;oBAChC,WAAW,aAAA;oBACX,kBAAkB,EAAE,kBAAkB;oBACtC,YAAY,EAAE,GAAG,CAAC,YAAY;oBAC9B,OAAO,EAAE,GAAG,CAAC,OAAO;iBACrB,CAAC;gBACI,kBAAkB,GAAG,IAAA,mBAAU,EAAC,UAAU,CAAC;oBAC/C,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;oBACrB,CAAC,CAAC,UAAU,CAAC;gBACf,4CACK,OAAO,KACV,UAAU,EAAE,kBAAkB,KAC9B;;;KACH,CAAC;AApEW,QAAA,sBAAsB,0BAoEjC;AAEF;;GAEG;AACU,QAAA,aAAa,GAAG,8BAAsB,CAAC"}
|
|
@@ -39,7 +39,7 @@ var createCustomDeployJobs = function (context) {
|
|
|
39
39
|
throw new Error("deploy config is not custom");
|
|
40
40
|
}
|
|
41
41
|
// FIXME: custom deploy currently assumes yarn-based project
|
|
42
|
-
var yarnInstall = (0, yarn_1.getYarnInstall)(context
|
|
42
|
+
var yarnInstall = (0, yarn_1.getYarnInstall)(context, {
|
|
43
43
|
noCustomPostInstall: true,
|
|
44
44
|
});
|
|
45
45
|
return (0, base_1.createDeployementJobs)(context, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/custom/deployJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuD;AACvD,uCAA8C;AAG9C,gCAAgD;AAChD,gCAGiB;AACjB,kCAA0C;AAEnC,IAAM,sBAAsB,GAAG,UACpC,OAAyB;;IAEzB,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC5C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,4DAA4D;IAC5D,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/custom/deployJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuD;AACvD,uCAA8C;AAG9C,gCAAgD;AAChD,gCAGiB;AACjB,kCAA0C;AAEnC,IAAM,sBAAsB,GAAG,UACpC,OAAyB;;IAEzB,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC5C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,4DAA4D;IAC5D,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE;QAC1C,mBAAmB,EAAE,IAAI;KAC1B,CAAC,CAAC;IACH,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,EAAE;YACN,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;YAC9D,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,EAAE;YAClC,MAAM;gBACJ,aAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAE;sBACtB,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,kBACrD,YAAY,CAAC,MAAM,kBACnB,IAAA,qCAA8B,EAAC,OAAO,CAAC,SAC3C;YACD,SAAS,EAAE,EAAE;SACd;QACD,IAAI,EAAE,YAAY,CAAC,UAAU;YAC3B,CAAC,CAAC;gBACE,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;gBAC9D,MAAM,yCACD,YAAY,CAAC,UAAU,kBACvB,IAAA,qCAA8B,EAAC,OAAO,CAAC,SAC3C;gBACD,SAAS,EAAE,EAAE;aACd;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;AACL,CAAC,CAAC;AApCW,QAAA,sBAAsB,0BAoCjC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
}
|
|
1
|
+
import type { ComponentContext, Config, PipelineTrigger, PipelineType } from "../types";
|
|
2
|
+
import type { CatladderJob } from "../types/jobs";
|
|
3
|
+
export type AllCatladderJobs = Array<{
|
|
4
|
+
context: ComponentContext;
|
|
5
|
+
jobs: Array<CatladderJob>;
|
|
6
|
+
}>;
|
|
7
7
|
export type AllJobsContext = {
|
|
8
8
|
config: Config;
|
|
9
9
|
trigger: PipelineTrigger;
|
|
@@ -1,15 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __assign = (this && this.__assign) || function () {
|
|
3
|
-
__assign = Object.assign || function(t) {
|
|
4
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
-
s = arguments[i];
|
|
6
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
-
t[p] = s[p];
|
|
8
|
-
}
|
|
9
|
-
return t;
|
|
10
|
-
};
|
|
11
|
-
return __assign.apply(this, arguments);
|
|
12
|
-
};
|
|
13
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
14
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
15
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -95,14 +84,13 @@ var createAllJobs = function (_a) { return __awaiter(void 0, [_a], void 0, funct
|
|
|
95
84
|
})];
|
|
96
85
|
case 1:
|
|
97
86
|
allComponentContext = _c.sent();
|
|
98
|
-
return [2 /*return*/, allComponentContext.
|
|
99
|
-
var
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
}, {})];
|
|
87
|
+
return [2 /*return*/, allComponentContext.map(function (_a) {
|
|
88
|
+
var context = _a.context;
|
|
89
|
+
return ({
|
|
90
|
+
context: context,
|
|
91
|
+
jobs: (0, createJobsForComponent_1.createJobsForComponentContext)(context),
|
|
92
|
+
});
|
|
93
|
+
})];
|
|
106
94
|
}
|
|
107
95
|
});
|
|
108
96
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAllJobs.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createAllJobs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createAllJobs.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createAllJobs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAAgD;AAChD,sCAAoD;AAQpD,mEAAyE;AAazE,IAAM,yBAAyB,GAAG,iEAAO,EAIxB;QAHf,MAAM,YAAA,EACN,OAAO,aAAA,EACP,YAAY,kBAAA;;;oBAQL,qBAAM,OAAO,CAAC,GAAG,CACtB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,UAAC,aAAa;oBACnD,IAAM,IAAI,GAAG,IAAA,4BAAmB,EAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;oBACjE,OAAO,IAAI,CAAC,GAAG,CAAC,UAAO,GAAG;;;;wCACR,qBAAM,IAAA,gCAAsB,EAAC;wCAC3C,MAAM,QAAA;wCACN,aAAa,eAAA;wCACb,GAAG,KAAA;wCACH,OAAO,SAAA;wCACP,YAAY,cAAA;qCACb,CAAC,EAAA;;oCANI,OAAO,GAAG,SAMd;oCAEF,sBAAO;4CACL,GAAG,KAAA;4CACH,aAAa,eAAA;4CACb,OAAO,SAAA;yCACR,EAAC;;;yBACH,CAAC,CAAC;gBACL,CAAC,CAAC,CACH,EAAA;oBAnBD,sBAAO,SAmBN,EAAC;;;KACH,CAAC;AAEK,IAAM,aAAa,GAAG,iEAAO,EAInB;;QAHf,MAAM,YAAA,EACN,OAAO,aAAA,EACP,YAAY,kBAAA;;;oBAEgB,qBAAM,yBAAyB,CAAC;oBAC1D,MAAM,QAAA;oBACN,OAAO,SAAA;oBACP,YAAY,cAAA;iBACb,CAAC,EAAA;;gBAJI,mBAAmB,GAAG,SAI1B;gBAEF,sBAAO,mBAAmB,CAAC,GAAG,CAAC,UAAC,EAAW;4BAAT,OAAO,aAAA;wBAAO,OAAA,CAAC;4BAC/C,OAAO,SAAA;4BACP,IAAI,EAAE,IAAA,sDAA6B,EAAC,OAAO,CAAC;yBAC7C,CAAC;oBAH8C,CAG9C,CAAC,EAAC;;;KACL,CAAC;AAfW,QAAA,aAAa,iBAexB"}
|
|
@@ -107,8 +107,8 @@ var createMainPipeline = function (pipelineType, config) { return __awaiter(void
|
|
|
107
107
|
// this is purely for better readability in git diffs when you add new components
|
|
108
108
|
.sort(function (a, b) {
|
|
109
109
|
var componentNames = Object.keys(config.components);
|
|
110
|
-
var aIndex = componentNames.findIndex(function (c) { return c === a.componentName; });
|
|
111
|
-
var bIndex = componentNames.findIndex(function (c) { return c === b.componentName; });
|
|
110
|
+
var aIndex = componentNames.findIndex(function (c) { return c === a.context.componentName; });
|
|
111
|
+
var bIndex = componentNames.findIndex(function (c) { return c === b.context.componentName; });
|
|
112
112
|
return aIndex - bIndex;
|
|
113
113
|
})
|
|
114
114
|
.reduce(function (acc, _a) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createMainPipeline.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createMainPipeline.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAKkB;AAQlB,0CAAqE;AACrE,iDAAgD;AAChD,yDAAwD;AACxD,8DAA6D;AAC7D,sEAAiF;AACjF,gEAAkE;AAE3D,IAAM,kBAAkB,GAAG,UAChC,YAAe,EACf,MAAc;;;;;gBAER,MAAM,GAAG,IAAA,qCAAiB,EAAC,MAAM,CAAC,CAAC;qBAErC,CAAA,YAAY,KAAK,QAAQ,CAAA,EAAzB,wBAAyB;gBAGD,qBAAM,OAAO,CAAC,GAAG,CACzC,8BAAqB,CAAC,GAAG,CACvB,UAAO,OAAO;;;;;oCACN,KAAA,mCAAgB,CAAA;oCACpB,qBAAM,IAAA,6BAAa,EAAC,EAAE,MAAM,QAAA,EAAE,OAAO,SAAA,EAAE,YAAY,cAAA,EAAE,CAAC,EAAA;wCADxD,qBAAM,kBACJ,SAAsD,EACtD,wBAAwB,CAAC,OAAO,CAAC,EAClC,EAAA;wCAHD,sBAAA,SAGC,EAAA;;;yBAAA,CACJ,CACF,EAAA;;gBARK,iBAAiB,GAAG,SAQzB;gBAEK,OAAO,GAAG,iBAAiB;qBAC9B,IAAI,EAAE;oBACP,uEAAuE;oBACvE,iFAAiF;qBAChF,IAAI,CAAC,UAAC,CAAC,EAAE,CAAC;oBACT,IAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;oBACtD,IAAM,MAAM,GAAG,cAAc,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"createMainPipeline.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createMainPipeline.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ComponentContext, GitlabJobDef, GitlabRule } from "../../types";
|
|
2
|
+
import type { CatladderJob } from "../../types/jobs";
|
|
2
3
|
import type { AllCatladderJobs } from "../createAllJobs";
|
|
3
4
|
export type AllGitlabJobs = {
|
|
4
5
|
name: string;
|
|
5
6
|
gitlabJob: GitlabJobDef;
|
|
6
|
-
|
|
7
|
-
env: string;
|
|
7
|
+
context: ComponentContext;
|
|
8
8
|
}[];
|
|
9
9
|
export declare const GITLAB_ENVIRONMENT_URL_VARIABLE = "CL_GITLAB_ENVIRONMENT_URL";
|
|
10
|
-
export declare const makeGitlabJob: (
|
|
10
|
+
export declare const makeGitlabJob: (context: ComponentContext, { environment, envMode, needsStages, needsOtherComponent, name, needs, jobTags, script, variables, runnerVariables, when, ...job }: CatladderJob<string>, allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => [fullName: string, job: GitlabJobDef];
|
|
11
11
|
export declare const createGitlabJobs: (allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => Promise<AllGitlabJobs>;
|
|
@@ -99,7 +99,8 @@ var getFullJobName = function (name, componentName, env) {
|
|
|
99
99
|
};
|
|
100
100
|
var getFullReferencedJobName = function (referencedJobName, componentName, env, allJobs) {
|
|
101
101
|
var _a, _b;
|
|
102
|
-
var referencedJob = (_b = (_a = allJobs
|
|
102
|
+
var referencedJob = (_b = (_a = allJobs
|
|
103
|
+
.find(function (j) { return j.context.componentName === componentName && j.context.env === env; })) === null || _a === void 0 ? void 0 : _a.jobs) === null || _b === void 0 ? void 0 : _b.find(function (j) { return j.name === referencedJobName; });
|
|
103
104
|
if (!referencedJob) {
|
|
104
105
|
throw new Error("unknown job referenced: '".concat(referencedJobName, "' from '").concat(env, ":").concat(componentName, "'"));
|
|
105
106
|
}
|
|
@@ -109,14 +110,19 @@ var getFullReferencedJobName = function (referencedJobName, componentName, env,
|
|
|
109
110
|
var getJobName = function (need) {
|
|
110
111
|
return (0, lodash_1.isObject)(need) ? need.job : need;
|
|
111
112
|
};
|
|
112
|
-
var makeGitlabJob = function (
|
|
113
|
+
var makeGitlabJob = function (context, _a, allJobs, baseRules) {
|
|
113
114
|
var _b, _c;
|
|
114
|
-
var environment = _a.environment, envMode = _a.envMode, needsStages = _a.needsStages, needsOtherComponent = _a.needsOtherComponent, name = _a.name, needs = _a.needs, jobTags = _a.jobTags, script = _a.script,
|
|
115
|
-
var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(env) : job.stage;
|
|
115
|
+
var environment = _a.environment, envMode = _a.envMode, needsStages = _a.needsStages, needsOtherComponent = _a.needsOtherComponent, name = _a.name, needs = _a.needs, jobTags = _a.jobTags, script = _a.script, variables = _a.variables, runnerVariables = _a.runnerVariables, when = _a.when, job = __rest(_a, ["environment", "envMode", "needsStages", "needsOtherComponent", "name", "needs", "jobTags", "script", "variables", "runnerVariables", "when"]);
|
|
116
|
+
var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(context.env) : job.stage;
|
|
116
117
|
var needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap(function (n) {
|
|
117
|
-
var _a, _b, _c
|
|
118
|
-
var referencedComponentName = componentName;
|
|
119
|
-
var allJobNamesFromThatStage = (
|
|
118
|
+
var _a, _b, _c;
|
|
119
|
+
var referencedComponentName = context.componentName;
|
|
120
|
+
var allJobNamesFromThatStage = (_c = (_b = (_a = allJobs
|
|
121
|
+
.filter(function (j) {
|
|
122
|
+
return j.context.componentName === referencedComponentName &&
|
|
123
|
+
j.context.env === context.env;
|
|
124
|
+
})
|
|
125
|
+
.flatMap(function (j) { return j.jobs; })) === null || _a === void 0 ? void 0 : _a.filter(function (j) { return j.stage === n.stage; })) === null || _b === void 0 ? void 0 : _b.map(function (j) { return j.name; })) !== null && _c !== void 0 ? _c : [];
|
|
120
126
|
return allJobNamesFromThatStage.map(function (job) {
|
|
121
127
|
var _a;
|
|
122
128
|
return ({
|
|
@@ -131,13 +137,13 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
|
|
|
131
137
|
var _a;
|
|
132
138
|
return (0, lodash_1.isObject)(n)
|
|
133
139
|
? {
|
|
134
|
-
job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : componentName, env, allJobs),
|
|
140
|
+
job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : context.componentName, context.env, allJobs),
|
|
135
141
|
artifacts: n.artifacts,
|
|
136
142
|
}
|
|
137
|
-
: getFullReferencedJobName(n, componentName, env, allJobs);
|
|
143
|
+
: getFullReferencedJobName(n, context.componentName, context.env, allJobs);
|
|
138
144
|
}).sort(function (a, b) { return getJobName(a).localeCompare(getJobName(b)); });
|
|
139
145
|
var deduplicatedGitlabNeeds = __spreadArray([], __read(new Map(gitlabNeeds.map(function (n) { return [(0, lodash_1.isObject)(n) ? n.job : n, n]; })).values()), false);
|
|
140
|
-
var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
|
|
146
|
+
var fullJobName = getFullJobName(name, context.componentName, envMode !== "none" ? context.env : undefined);
|
|
141
147
|
// backwards compatibility, some may still use KUBERNETES_CPU_REQUEST, KUBERNETES_MEMORY_REQUEST, etc. in variables.
|
|
142
148
|
// those should now be set in the runnerVariables as they don't work in the variables key of the catladder job, becuase those get injected
|
|
143
149
|
var PIPELINE_RUNNER_VARIABLES = [
|
|
@@ -167,7 +173,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
|
|
|
167
173
|
: [])), false);
|
|
168
174
|
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,
|
|
169
175
|
// sort in a predictable manner for snapshot tests
|
|
170
|
-
needs: deduplicatedGitlabNeeds, retry: defaults_1.BASE_RETRY, interruptible: true }), componentName, env, allJobs);
|
|
176
|
+
needs: deduplicatedGitlabNeeds, retry: defaults_1.BASE_RETRY, interruptible: true }), context.componentName, context.env, allJobs);
|
|
171
177
|
return [fullJobName, (0, removeUndefined_1.removeUndefined)(modified)];
|
|
172
178
|
};
|
|
173
179
|
exports.makeGitlabJob = makeGitlabJob;
|
|
@@ -200,19 +206,15 @@ allJobs) {
|
|
|
200
206
|
};
|
|
201
207
|
var createGitlabJobs = function (allJobs, baseRules) { return __awaiter(void 0, void 0, void 0, function () {
|
|
202
208
|
return __generator(this, function (_a) {
|
|
203
|
-
return [2 /*return*/,
|
|
204
|
-
var
|
|
205
|
-
return
|
|
206
|
-
var
|
|
207
|
-
return
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
componentName: componentName,
|
|
213
|
-
env: env,
|
|
214
|
-
};
|
|
215
|
-
});
|
|
209
|
+
return [2 /*return*/, allJobs.flatMap(function (_a) {
|
|
210
|
+
var context = _a.context, jobs = _a.jobs;
|
|
211
|
+
return jobs.map(function (job) {
|
|
212
|
+
var _a = __read((0, exports.makeGitlabJob)(context, job, allJobs, baseRules), 2), fullJobName = _a[0], gitlabJob = _a[1];
|
|
213
|
+
return {
|
|
214
|
+
name: fullJobName,
|
|
215
|
+
gitlabJob: gitlabJob,
|
|
216
|
+
context: context,
|
|
217
|
+
};
|
|
216
218
|
});
|
|
217
219
|
})];
|
|
218
220
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createGitlabJobs.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/createGitlabJobs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAyC;AACzC,sEAAqE;AACrE,2CAA4C;
|
|
1
|
+
{"version":3,"file":"createGitlabJobs.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/createGitlabJobs.ts"],"names":[],"mappings":"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"}
|