@catladder/cli 0.0.0-main-4188853e → 0.0.0-main-ccd87a98
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 +9 -5
- package/dist/bundles/cli/index.js +9 -5
- package/dist/pipeline/src/context/createComponentContext.js.map +1 -1
- package/dist/pipeline/src/context/getEnvConfig.js +6 -3
- package/dist/pipeline/src/context/getEnvConfig.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunJobs.js +2 -2
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunJobs.js.map +1 -1
- package/dist/pipeline/src/deploy/types/googleCloudRun.d.ts +4 -0
- 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/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -3015,12 +3015,15 @@ const getEnvConfig = (config, componentName, env) => {
|
|
|
3015
3015
|
return defaultConfig;
|
|
3016
3016
|
}
|
|
3017
3017
|
/**
|
|
3018
|
-
*
|
|
3018
|
+
* env config is merged with default. Arrays are not merged.
|
|
3019
3019
|
* you can customize this by providing a function that takes the default value as argument
|
|
3020
3020
|
*/
|
|
3021
|
-
return (0, lodash_1.mergeWith)(
|
|
3021
|
+
return (0, lodash_1.mergeWith)(
|
|
3022
|
+
// mergeWith unfortunatly mutates the first object, so we need to clone it.
|
|
3023
|
+
// Passing empty object also doesn't work for us, because that will mess with the customizer function (second argument isn't nessecary the customized value)
|
|
3024
|
+
(0, lodash_1.cloneDeep)(defaultConfig), envCustomizations, (defaultValue, customValue, key, obj, source) => {
|
|
3022
3025
|
// check if custom value is a function (and default is not),
|
|
3023
|
-
// we currently don't have config options that are functions, but we might in the future
|
|
3026
|
+
// we currently don't have config options, that are functions, but we might in the future (customJobs is an exception)
|
|
3024
3027
|
if (typeof customValue === "function" &&
|
|
3025
3028
|
typeof defaultValue !== "function") {
|
|
3026
3029
|
return customValue(defaultValue);
|
|
@@ -3881,7 +3884,7 @@ const getDeleteJobsScripts = (context) => {
|
|
|
3881
3884
|
};
|
|
3882
3885
|
exports.getDeleteJobsScripts = getDeleteJobsScripts;
|
|
3883
3886
|
const getJobCreateScripts = (context) => (0, exports.getCloudRunJobsWithNames)(context).map(({ job, fullJobName }, jobIndex) => {
|
|
3884
|
-
var _a, _b, _c, _d;
|
|
3887
|
+
var _a, _b, _c, _d, _e;
|
|
3885
3888
|
const commandArray = Array.isArray(job.command)
|
|
3886
3889
|
? job.command
|
|
3887
3890
|
: job.command.split(" ");
|
|
@@ -3898,7 +3901,7 @@ const getJobCreateScripts = (context) => (0, exports.getCloudRunJobsWithNames)(c
|
|
|
3898
3901
|
parallelism: (_c = job.parallelism) !== null && _c !== void 0 ? _c : 1,
|
|
3899
3902
|
"task-timeout": (_d = job.timeout) !== null && _d !== void 0 ? _d : "10m",
|
|
3900
3903
|
"env-vars-file": constants_1.ENV_VARS_FILENAME,
|
|
3901
|
-
"max-retries": 0,
|
|
3904
|
+
"max-retries": (_e = job.maxRetries) !== null && _e !== void 0 ? _e : 0,
|
|
3902
3905
|
...deployArgs,
|
|
3903
3906
|
// network
|
|
3904
3907
|
"vpc-connector": job === null || job === void 0 ? void 0 : job.vpcConnector,
|
|
@@ -6706,6 +6709,7 @@ __exportStar(__nccwpck_require__(688), exports);
|
|
|
6706
6709
|
__exportStar(__nccwpck_require__(1724), exports);
|
|
6707
6710
|
__exportStar(__nccwpck_require__(8207), exports);
|
|
6708
6711
|
__exportStar(__nccwpck_require__(2074), exports);
|
|
6712
|
+
__exportStar(__nccwpck_require__(7432), exports);
|
|
6709
6713
|
//# sourceMappingURL=index.js.map
|
|
6710
6714
|
|
|
6711
6715
|
/***/ }),
|
|
@@ -5947,12 +5947,15 @@ const getEnvConfig = (config, componentName, env) => {
|
|
|
5947
5947
|
return defaultConfig;
|
|
5948
5948
|
}
|
|
5949
5949
|
/**
|
|
5950
|
-
*
|
|
5950
|
+
* env config is merged with default. Arrays are not merged.
|
|
5951
5951
|
* you can customize this by providing a function that takes the default value as argument
|
|
5952
5952
|
*/
|
|
5953
|
-
return (0, lodash_1.mergeWith)(
|
|
5953
|
+
return (0, lodash_1.mergeWith)(
|
|
5954
|
+
// mergeWith unfortunatly mutates the first object, so we need to clone it.
|
|
5955
|
+
// Passing empty object also doesn't work for us, because that will mess with the customizer function (second argument isn't nessecary the customized value)
|
|
5956
|
+
(0, lodash_1.cloneDeep)(defaultConfig), envCustomizations, (defaultValue, customValue, key, obj, source) => {
|
|
5954
5957
|
// check if custom value is a function (and default is not),
|
|
5955
|
-
// we currently don't have config options that are functions, but we might in the future
|
|
5958
|
+
// we currently don't have config options, that are functions, but we might in the future (customJobs is an exception)
|
|
5956
5959
|
if (typeof customValue === "function" &&
|
|
5957
5960
|
typeof defaultValue !== "function") {
|
|
5958
5961
|
return customValue(defaultValue);
|
|
@@ -6813,7 +6816,7 @@ const getDeleteJobsScripts = (context) => {
|
|
|
6813
6816
|
};
|
|
6814
6817
|
exports.getDeleteJobsScripts = getDeleteJobsScripts;
|
|
6815
6818
|
const getJobCreateScripts = (context) => (0, exports.getCloudRunJobsWithNames)(context).map(({ job, fullJobName }, jobIndex) => {
|
|
6816
|
-
var _a, _b, _c, _d;
|
|
6819
|
+
var _a, _b, _c, _d, _e;
|
|
6817
6820
|
const commandArray = Array.isArray(job.command)
|
|
6818
6821
|
? job.command
|
|
6819
6822
|
: job.command.split(" ");
|
|
@@ -6830,7 +6833,7 @@ const getJobCreateScripts = (context) => (0, exports.getCloudRunJobsWithNames)(c
|
|
|
6830
6833
|
parallelism: (_c = job.parallelism) !== null && _c !== void 0 ? _c : 1,
|
|
6831
6834
|
"task-timeout": (_d = job.timeout) !== null && _d !== void 0 ? _d : "10m",
|
|
6832
6835
|
"env-vars-file": constants_1.ENV_VARS_FILENAME,
|
|
6833
|
-
"max-retries": 0,
|
|
6836
|
+
"max-retries": (_e = job.maxRetries) !== null && _e !== void 0 ? _e : 0,
|
|
6834
6837
|
...deployArgs,
|
|
6835
6838
|
// network
|
|
6836
6839
|
"vpc-connector": job === null || job === void 0 ? void 0 : job.vpcConnector,
|
|
@@ -9638,6 +9641,7 @@ __exportStar(__nccwpck_require__(30688), exports);
|
|
|
9638
9641
|
__exportStar(__nccwpck_require__(61724), exports);
|
|
9639
9642
|
__exportStar(__nccwpck_require__(28207), exports);
|
|
9640
9643
|
__exportStar(__nccwpck_require__(32074), exports);
|
|
9644
|
+
__exportStar(__nccwpck_require__(17432), exports);
|
|
9641
9645
|
//# sourceMappingURL=index.js.map
|
|
9642
9646
|
|
|
9643
9647
|
/***/ }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createComponentContext.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/createComponentContext.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACpC,oCAAgE;AAEhE,sCAAyC;AAEzC,+DAA+E;AAS/E,oCAAkD;AAClD,qDAAkD;AAClD,mEAAgE;AAUzD,MAAM,sBAAsB,GAAG,KAAK,EACzC,GAAkC,EACP,EAAE;;IAC7B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAC;IACJ,CAAC;IAED,MAAM,kBAAkB,GAAG,MAAM,IAAA,kDAAiC,EAChE,GAAG,CAAC,MAAM,EACV,GAAG,CAAC,aAAa,CAClB,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,6CAAqB,EAAC,GAAG,CAAC,CAAC;IAE9C,MAAM,8BAA8B,GAAG,UAAU,CAAC,YAAY,CAAC;IAE/D,MAAM,iBAAiB,GAAG,IAAA,+BAAuB,EAC/C,8BAA8B,CAAC,KAAK,CACrC;QACC,CAAC,CAAC,8BAA8B,CAAC,KAAK,CAAC,IAAI;QAC3C,CAAC,CAAC,MAAA,GAAG,CAAC,MAAM,CAAC,MAAM,0CAAG,8BAA8B,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC;IACxE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACxE,CAAC;IACD,MAAM,QAAQ,GAGV,8BAA8B,CAAC,MAAM;QACvC,CAAC,CAAC;YACE,KAAK,EAAE,mBAAW,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;YAC1D,MAAM,EAAE,qBAAY,CAClB,8BAA8B,CAAC,MAAM,CAAC,IAAwB,CAC/D,CAAC,QAAQ,CAAC,UAAiB,CAAC;SAC9B;QACH,CAAC,CAAC;YACE,KAAK,EAAE,mBAAW,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;YAC1D,MAAM,EAAE,EAAE;SACX,CAAC;IAEN,MAAM,eAAe,GAAG,IAAA,8BAAsB,EAC5C,QAAQ,EACR,8BAA8B,CAC/B,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,IAAA,+BAAc,EAAC,GAAG,CAAC,CAAC;IAC9C,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,eAAe,CAAC;IAC3D,MAAM,gBAAgB,GAAqC,CAAC,IAAI,EAAE,EAAE;;QAAC,OAAA;YACnE,GAAG;YACH,sGAAsG;YACtG,GAAG,CAAC,IAAI,KAAK,KAAK;gBAChB,CAAC,CAAC,CAAC,MAAA,kBAAkB,CAAC,4BAA4B,mCAAI,EAAE,CAAC;gBACzD,CAAC,CAAC,EAAE,CAAC;SACR,CAAA;KAAA,CAAC;IACF,MAAM,gBAAgB,GAAG,GAA0B,EAAE;;QACnD,IAAI,IAAA,+BAAuB,EAAC,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO;gBACL,GAAG,EAAE,GAAG;gBACR,gBAAgB;gBAChB,MAAM,EAAE,KAAK;gBACb,SAAS,EAAE,KAAK,CAAC,IAAI;gBACrB,IAAI,EAAE,YAAY;aACnB,CAAC;QACJ,CAAC;QACD,uBAAuB;QACvB,MAAM,eAAe,GAAG,MAAA,GAAG,CAAC,MAAM,CAAC,MAAM,0CAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACpD,CAAC;QACD,OAAO;YACL,GAAG,EAAE,GAAG;YACR,gBAAgB;YAChB,MAAM,EAAE,KAAK;YACb,oBAAoB,EAAE,eAAe;YACrC,aAAa,EAAE,KAAK,CAAC,IAAI;YACzB,SAAS,EAAE,eAAe,CAAC,IAAI;YAC/B,IAAI,EAAE,eAAe;SACtB,CAAC;IACJ,CAAC,CAAC;IACF,MAAM,YAAY,GAA0B,gBAAgB,EAAE,CAAC;IAC/D,MAAM,OAAO,GAAyC;QACpD,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,GAAG,CAAC,aAAa;QACvB,GAAG,EAAE,GAAG,CAAC,GAAG;QACZ,UAAU,EAAE,GAAG,CAAC,MAAM;QACtB,eAAe;QAEf,KAAK,EAAE,YAAY;QACnB,MAAM,EAAE,MAAM;YACZ,CAAC,CAAC;gBACE,MAAM,EAAE,MAAM;aACf;YACH,CAAC,CAAC,IAAI;QAER,WAAW;QACX,kBAAkB,EAAE,kBAAkB;QACtC,YAAY,EAAE,GAAG,CAAC,YAAY;QAC9B,OAAO,EAAE,GAAG,CAAC,OAAO;KACrB,CAAC;
|
|
1
|
+
{"version":3,"file":"createComponentContext.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/createComponentContext.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,12 +14,15 @@ const getEnvConfig = (config, componentName, env) => {
|
|
|
14
14
|
return defaultConfig;
|
|
15
15
|
}
|
|
16
16
|
/**
|
|
17
|
-
*
|
|
17
|
+
* env config is merged with default. Arrays are not merged.
|
|
18
18
|
* you can customize this by providing a function that takes the default value as argument
|
|
19
19
|
*/
|
|
20
|
-
return (0, lodash_1.mergeWith)(
|
|
20
|
+
return (0, lodash_1.mergeWith)(
|
|
21
|
+
// mergeWith unfortunatly mutates the first object, so we need to clone it.
|
|
22
|
+
// Passing empty object also doesn't work for us, because that will mess with the customizer function (second argument isn't nessecary the customized value)
|
|
23
|
+
(0, lodash_1.cloneDeep)(defaultConfig), envCustomizations, (defaultValue, customValue, key, obj, source) => {
|
|
21
24
|
// check if custom value is a function (and default is not),
|
|
22
|
-
// we currently don't have config options that are functions, but we might in the future
|
|
25
|
+
// we currently don't have config options, that are functions, but we might in the future (customJobs is an exception)
|
|
23
26
|
if (typeof customValue === "function" &&
|
|
24
27
|
typeof defaultValue !== "function") {
|
|
25
28
|
return customValue(defaultValue);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getEnvConfig.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/getEnvConfig.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"getEnvConfig.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/getEnvConfig.ts"],"names":[],"mappings":";;;AAAA,mCAA8C;AAGvC,MAAM,YAAY,GAAG,CAC1B,MAAc,EACd,aAAqB,EACrB,GAAW,EACa,EAAE;;IAC1B,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACvD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,aAAa,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,iBAAiB,GAAG,MAAA,MAAA,aAAa,CAAC,GAAG,0CAAG,GAAG,CAAC,mCAAI,EAAE,CAAC;IACzD,IAAI,iBAAiB,KAAK,KAAK,EAAE,CAAC;QAChC,mDAAmD;QACnD,OAAO,aAAa,CAAC;IACvB,CAAC;IACD;;;OAGG;IACH,OAAO,IAAA,kBAAS;IACd,2EAA2E;IAC3E,4JAA4J;IAC5J,IAAA,kBAAS,EAAC,aAAa,CAAC,EACxB,iBAAiB,EACjB,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;QAC9C,4DAA4D;QAC5D,sHAAsH;QACtH,IACE,OAAO,WAAW,KAAK,UAAU;YACjC,OAAO,YAAY,KAAK,UAAU,EAClC,CAAC;YACD,OAAO,WAAW,CAAC,YAAY,CAAC,CAAC;QACnC,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AArCW,QAAA,YAAY,gBAqCvB"}
|
|
@@ -21,7 +21,7 @@ const getDeleteJobsScripts = (context) => {
|
|
|
21
21
|
};
|
|
22
22
|
exports.getDeleteJobsScripts = getDeleteJobsScripts;
|
|
23
23
|
const getJobCreateScripts = (context) => (0, exports.getCloudRunJobsWithNames)(context).map(({ job, fullJobName }, jobIndex) => {
|
|
24
|
-
var _a, _b, _c, _d;
|
|
24
|
+
var _a, _b, _c, _d, _e;
|
|
25
25
|
const commandArray = Array.isArray(job.command)
|
|
26
26
|
? job.command
|
|
27
27
|
: job.command.split(" ");
|
|
@@ -38,7 +38,7 @@ const getJobCreateScripts = (context) => (0, exports.getCloudRunJobsWithNames)(c
|
|
|
38
38
|
parallelism: (_c = job.parallelism) !== null && _c !== void 0 ? _c : 1,
|
|
39
39
|
"task-timeout": (_d = job.timeout) !== null && _d !== void 0 ? _d : "10m",
|
|
40
40
|
"env-vars-file": constants_1.ENV_VARS_FILENAME,
|
|
41
|
-
"max-retries": 0,
|
|
41
|
+
"max-retries": (_e = job.maxRetries) !== null && _e !== void 0 ? _e : 0,
|
|
42
42
|
...deployArgs,
|
|
43
43
|
// network
|
|
44
44
|
"vpc-connector": job === null || job === void 0 ? void 0 : job.vpcConnector,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudRunJobs.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunJobs.ts"],"names":[],"mappings":";;;AAEA,0DAAuD;AACvD,0CAAwC;AAExC,gEAA6D;AAC7D,8CAAkD;AAClD,qCAMkB;AAClB,2CAAgD;AAChD,uCAA+C;AAC/C,iDAA2D;AAEpD,MAAM,oBAAoB,GAAG,CAAC,OAAyB,EAAE,EAAE;IAChE,MAAM,UAAU,GAAG,IAAA,8BAAqB,EAAC,OAAO,CAAC,CAAC;IAClD,MAAM,gBAAgB,GAAG,IAAA,mCAAgB,EAAC,UAAU,CAAC,CAAC;IACtD,MAAM,aAAa,GAAG,IAAA,gCAAwB,EAAC,OAAO,CAAC,CAAC;IAExD,OAAO,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;QAChD,gGAAgG;QAChG,GAAG,IAAA,qBAAY,GAAE,yBAAyB,gBAAgB,UAAU,WAAW,yCAAyC,IAAA,qBAAY,GAAE,uCAAuC,gBAAgB,EAAE;QAC/L,GAAG,IAAA,qBAAY,GAAE,gBAAgB,WAAW,IAAI,gBAAgB,EAAE;KACnE,CAAC,CAAC;AACL,CAAC,CAAC;AAVW,QAAA,oBAAoB,wBAU/B;AAEK,MAAM,mBAAmB,GAAG,CAAC,OAAyB,EAAY,EAAE,CACzE,IAAA,gCAAwB,EAAC,OAAO,CAAC,CAAC,GAAG,CACnC,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAU,EAAE;;IACzC,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;QAC7C,CAAC,CAAC,GAAG,CAAC,OAAO;QACb,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE3B,MAAM,EACJ,KAAK,EAAE,WAAW,EAClB,OAAO,EACP,MAAM,EACN,GAAG,UAAU,EACd,GAAG,IAAA,4BAAmB,EAAC,OAAO,CAAC,CAAC;IACjC,MAAM,sBAAsB,GAAG,IAAA,mCAAgB,EAC7C;QACE,OAAO,EAAE,IAAI,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG;QACtC,IAAI,EAAE,IAAA,gCAAqB,EAAC,GAAG,CAAC,IAAI,CAAC;QACrC,MAAM,EAAE,IAAI,IAAA,wBAAe,EAAC,IAAA,qBAAS,EAAC,OAAO,CAAC,CAAC,wCAAwC;QACvF,KAAK,EAAE,IAAI,MAAA,GAAG,CAAC,KAAK,mCAAI,WAAW,GAAG;QACtC,OAAO;QACP,MAAM;QACN,GAAG,EAAE,GAAG,CAAC,GAAG;QACZ,MAAM,EAAE,MAAA,GAAG,CAAC,MAAM,mCAAI,OAAO;QAC7B,WAAW,EAAE,MAAA,GAAG,CAAC,WAAW,mCAAI,CAAC;QAEjC,cAAc,EAAE,MAAA,GAAG,CAAC,OAAO,mCAAI,KAAK;QACpC,eAAe,EAAE,6BAAiB;QAClC,aAAa,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"cloudRunJobs.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunJobs.ts"],"names":[],"mappings":"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"}
|
|
@@ -163,6 +163,10 @@ export type DeployConfigCloudRunJobBase = {
|
|
|
163
163
|
* number of tasks that may run concurrently, defaults to 1
|
|
164
164
|
*/
|
|
165
165
|
parallelism?: number;
|
|
166
|
+
/**
|
|
167
|
+
* max number of retries of the job. Defaults to 0
|
|
168
|
+
*/
|
|
169
|
+
maxRetries?: number;
|
|
166
170
|
} & DeployConfigCloudRunWithVolumes & DeployConfigCloudRunNetworkConfig;
|
|
167
171
|
type Minute = string;
|
|
168
172
|
type Hour = string;
|
|
@@ -19,4 +19,5 @@ __exportStar(require("./gitlab-types"), exports);
|
|
|
19
19
|
__exportStar(require("./context"), exports);
|
|
20
20
|
__exportStar(require("./jobDefinition"), exports);
|
|
21
21
|
__exportStar(require("./pipeline"), exports);
|
|
22
|
+
__exportStar(require("./jobs"), exports);
|
|
22
23
|
//# 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,kDAAgC;AAChC,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;AAC3B,yCAAuB"}
|