@catladder/cli 1.146.0 → 1.146.1

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.
Files changed (6) hide show
  1. package/dist/bundles/catenv/index.js +1 -1
  2. package/dist/bundles/cli/index.js +1 -1
  3. package/dist/pipeline/src/pipeline/generatePipelineFiles.js +5 -5
  4. package/dist/pipeline/src/pipeline/generatePipelineFiles.js.map +1 -1
  5. package/dist/tsconfig.tsbuildinfo +1 -1
  6. package/package.json +1 -1
package/dist/pipeline/src/pipeline/generatePipelineFiles.js CHANGED
@@ -65,7 +65,7 @@ var createMainPipeline_1 = require("./createMainPipeline");
65
65
  var getPipelineTriggerForGitlabChildPipeline_1 = require("./gitlab/getPipelineTriggerForGitlabChildPipeline");
66
66
  function generatePipelineFiles(config, pipelineType, mode) {
67
67
  return __awaiter(this, void 0, void 0, function () {
68
- var trigger, _a, jobs, mainPipeline, _b, jobs, mainPipeline;
68
+ var trigger, _a, jobs, image, stages, variables, workflow, mainPipeline, _b, jobs, image, stages, variables, workflow, mainPipeline;
69
69
  return __generator(this, function (_c) {
70
70
  switch (_c.label) {
71
71
  case 0:
@@ -73,18 +73,18 @@ function generatePipelineFiles(config, pipelineType, mode) {
73
73
  trigger = (0, getPipelineTriggerForGitlabChildPipeline_1.getPipelineTriggerForGitlabChildPipeline)();
74
74
  return [4 /*yield*/, (0, createChildPipeline_1.createChildPipeline)(pipelineType, trigger, config)];
75
75
  case 1:
76
- _a = _c.sent(), jobs = _a.jobs, mainPipeline = __rest(_a, ["jobs"]);
76
+ _a = _c.sent(), jobs = _a.jobs, image = _a.image, stages = _a.stages, variables = _a.variables, workflow = _a.workflow, mainPipeline = __rest(_a, ["jobs", "image", "stages", "variables", "workflow"]);
77
77
  // need to spread out the jobs, forgot why
78
- return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)("__pipeline.yml", __assign(__assign({}, jobs), mainPipeline))];
78
+ return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)("__pipeline.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, mainPipeline), jobs))];
79
79
  case 2:
80
80
  // need to spread out the jobs, forgot why
81
81
  _c.sent();
82
82
  return [3 /*break*/, 6];
83
83
  case 3: return [4 /*yield*/, (0, createMainPipeline_1.createMainPipeline)(pipelineType, config)];
84
84
  case 4:
85
- _b = _c.sent(), jobs = _b.jobs, mainPipeline = __rest(_b, ["jobs"]);
85
+ _b = _c.sent(), jobs = _b.jobs, image = _b.image, stages = _b.stages, variables = _b.variables, workflow = _b.workflow, mainPipeline = __rest(_b, ["jobs", "image", "stages", "variables", "workflow"]);
86
86
  // need to spread out the jobs, forgot why
87
- return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)(".gitlab-ci.yml", __assign(__assign({}, jobs), mainPipeline))];
87
+ return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)(".gitlab-ci.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, mainPipeline), jobs))];
88
88
  case 5:
89
89
  // need to spread out the jobs, forgot why
90
90
  _c.sent();
package/dist/pipeline/src/pipeline/generatePipelineFiles.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generatePipelineFiles.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/generatePipelineFiles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoD;AACpD,6DAA4D;AAC5D,2DAA0D;AAC1D,8GAA6G;AAC7G,SAAsB,qBAAqB,CACzC,MAAc,EACd,YAAe,EACf,IAAqB;;;;;;yBAEjB,CAAA,IAAI,KAAK,eAAe,CAAA,EAAxB,wBAAwB;oBACpB,OAAO,GAAG,IAAA,mFAAwC,GAAE,CAAC;oBAEzB,qBAAM,IAAA,yCAAmB,EACzD,YAAY,EACZ,OAAO,EACP,MAAM,CACP,EAAA;;oBAJK,KAA4B,SAIjC,EAJO,IAAI,UAAA,EAAK,YAAY,cAAvB,QAAyB,CAAF;oBAK7B,0CAA0C;oBAC1C,qBAAM,IAAA,0BAAa,EAAC,gBAAgB,wBAAO,IAAI,GAAK,YAAY,EAAG,EAAA;;oBADnE,0CAA0C;oBAC1C,SAAmE,CAAC;;wBAElC,qBAAM,IAAA,uCAAkB,EACxD,YAAY,EACZ,MAAM,CACP,EAAA;;oBAHK,KAA4B,SAGjC,EAHO,IAAI,UAAA,EAAK,YAAY,cAAvB,QAAyB,CAAF;oBAI7B,0CAA0C;oBAC1C,qBAAM,IAAA,0BAAa,EAAC,gBAAgB,wBAAO,IAAI,GAAK,YAAY,EAAG,EAAA;;oBADnE,0CAA0C;oBAC1C,SAAmE,CAAC;;;;;;CAEvE;AAvBD,sDAuBC"}
1
+ {"version":3,"file":"generatePipelineFiles.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/generatePipelineFiles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoD;AACpD,6DAA4D;AAC5D,2DAA0D;AAC1D,8GAA6G;AAC7G,SAAsB,qBAAqB,CACzC,MAAc,EACd,YAAe,EACf,IAAqB;;;;;;yBAEjB,CAAA,IAAI,KAAK,eAAe,CAAA,EAAxB,wBAAwB;oBACpB,OAAO,GAAG,IAAA,mFAAwC,GAAE,CAAC;oBAGzD,qBAAM,IAAA,yCAAmB,EAAC,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,EAAA;;oBADpD,KACJ,SAAwD,EADlD,IAAI,UAAA,EAAE,KAAK,WAAA,EAAE,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,QAAQ,cAAA,EAAK,YAAY,cAA3D,oDAA6D,CAAF;oBAEjE,0CAA0C;oBAC1C,qBAAM,IAAA,0BAAa,EAAC,gBAAgB,sBAClC,KAAK,OAAA,EACL,MAAM,QAAA,EACN,SAAS,WAAA,EACT,QAAQ,UAAA,IACL,YAAY,GACZ,IAAI,EACP,EAAA;;oBARF,0CAA0C;oBAC1C,SAOE,CAAC;;wBAGD,qBAAM,IAAA,uCAAkB,EAAC,YAAY,EAAE,MAAM,CAAC,EAAA;;oBAD1C,KACJ,SAA8C,EADxC,IAAI,UAAA,EAAE,KAAK,WAAA,EAAE,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,QAAQ,cAAA,EAAK,YAAY,cAA3D,oDAA6D,CAAF;oBAEjE,0CAA0C;oBAC1C,qBAAM,IAAA,0BAAa,EAAC,gBAAgB,sBAClC,KAAK,OAAA,EACL,MAAM,QAAA,EACN,SAAS,WAAA,EACT,QAAQ,UAAA,IACL,YAAY,GACZ,IAAI,EACP,EAAA;;oBARF,0CAA0C;oBAC1C,SAOE,CAAC;;;;;;CAEN;AAhCD,sDAgCC"}