@catladder/cli 3.35.0 → 3.36.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.
- package/dist/bundles/catenv/index.js +1 -1
- package/dist/bundles/cli/index.js +1 -1
- package/dist/pipeline/src/deploy/base/deploy.js +34 -30
- package/dist/pipeline/src/deploy/base/deploy.js.map +1 -1
- package/dist/pipeline/src/deploy/base/stop.js +0 -6
- package/dist/pipeline/src/deploy/base/stop.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -51,40 +51,44 @@ const createDeployJob = (context, jobDefinition) => {
|
|
|
51
51
|
}))) !== null && _d !== void 0 ? _d : [])
|
|
52
52
|
: []),
|
|
53
53
|
],
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
54
|
+
needsStages:
|
|
55
|
+
// if the build is disabled, we don't need to wait for it
|
|
56
|
+
context.build.type !== "disabled"
|
|
57
|
+
? [
|
|
58
|
+
...((0, context_1.componentContextHasWorkspaceBuild)(context)
|
|
59
|
+
? hasDocker // docker build is per component,
|
|
60
|
+
? [
|
|
61
|
+
// we don't need artifacts, but have to wait for the component build
|
|
62
|
+
{
|
|
63
|
+
stage: "build",
|
|
64
|
+
artifacts: false,
|
|
65
|
+
},
|
|
66
|
+
]
|
|
67
|
+
: [
|
|
68
|
+
{
|
|
69
|
+
// pick build artifacts from workspace build
|
|
70
|
+
stage: "build",
|
|
71
|
+
artifacts: true,
|
|
72
|
+
workspaceName: context.build.workspaceName,
|
|
73
|
+
},
|
|
74
|
+
]
|
|
65
75
|
: [
|
|
66
76
|
{
|
|
67
|
-
// pick build artifacts from workspace build
|
|
68
77
|
stage: "build",
|
|
69
|
-
artifacts: true,
|
|
70
|
-
workspaceName: context.build.workspaceName,
|
|
78
|
+
artifacts: hasDocker ? false : true, // we asume that no-docker deployments need build artifacts,
|
|
71
79
|
},
|
|
72
|
-
]
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
? context.build.workspaceName
|
|
85
|
-
: undefined,
|
|
86
|
-
},
|
|
87
|
-
],
|
|
80
|
+
]),
|
|
81
|
+
// we don't want to deploy when there is a broken test
|
|
82
|
+
{
|
|
83
|
+
stage: "test",
|
|
84
|
+
artifacts: false,
|
|
85
|
+
// use test from workspace build
|
|
86
|
+
workspaceName: (0, context_1.componentContextHasWorkspaceBuild)(context)
|
|
87
|
+
? context.build.workspaceName
|
|
88
|
+
: undefined,
|
|
89
|
+
},
|
|
90
|
+
]
|
|
91
|
+
: [],
|
|
88
92
|
when: whenDeploy === "auto" ? "on_success" : "manual",
|
|
89
93
|
allow_failure: whenDeploy === "manual" ? true : false,
|
|
90
94
|
stage: "deploy",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/deploy.ts"],"names":[],"mappings":";;;AAAA,qEAAkF;AAClF,+CAG4B;AAC5B,2CAAuD;AAEvD,iDAG6B;AAE7B,kCAA0C;AAC1C,oCAA8C;AAC9C,iCAAuC;AAEvC,2CAAsD;AAEzC,QAAA,eAAe,GAAG,WAAW,CAAC;AAEpC,MAAM,eAAe,GAAG,CAC7B,OAAyB,EACzB,aAAkC,EACpB,EAAE;;IAChB,MAAM,SAAS,GAAG,IAAA,4BAAmB,EAAC,OAAO,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,IAAA,0BAAkB,EAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,QAAQ,GACZ,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,QAAQ;QACtC,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,KAAK;YACrC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS,CAAC;IAElB,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,uDAAuD;IACvD,MAAM,iBAAiB,GACrB,YAAY,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACpE,mGAAmG;IACnG,MAAM,iBAAiB,GACrB,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,MAAM;QACpC,CAAC,CAAC,MAAM,CAAC,4BAA4B;QACrC,CAAC,CAAC,CAAA,MAAA,OAAO,CAAC,eAAe,CAAC,GAAG,0CAAE,KAAK,MAAK,KAAK;YAC5C,CAAC,CAAC,MAAM,CAAC,uCAAuC;YAChD,CAAC,CAAC,QAAQ,CAAC,CAAC,kBAAkB;IACpC,MAAM,UAAU,GAAG,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAE7E,OAAO;QACL,IAAI,EAAE,uBAAe;QACrB,MAAM,EAAE,aAAa,CAAC,MAAM;QAC5B,KAAK,EAAE,aAAa,CAAC,KAAK;QAC1B,KAAK,EAAE,aAAa,CAAC,KAAK;YACxB,CAAC,CAAC,IAAA,+CAA8B,EAAC,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC;YAC9D,CAAC,CAAC,SAAS;QACb,SAAS,EAAE,aAAa,CAAC,SAAS;QAClC,QAAQ,EAAE,aAAa,CAAC,QAAQ;QAChC,OAAO,EAAE,aAAa,EAAE,6CAA6C;QAErE,KAAK,EAAE;YACL,GAAG,CAAC,IAAA,sBAAe,EAAC,OAAO,CAAC;gBAC1B,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,0BAAmB,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACpD,GAAG,CAAC,YAAY;gBACd,CAAC,CAAC,CAAC,MAAA,MAAA,YAAY,CAAC,OAAO,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACjC,aAAa,EAAE,CAAC;oBAChB,GAAG,EAAE,uBAAe;oBACpB,SAAS,EAAE,KAAK;iBACjB,CAAC,CAAC,mCAAI,EAAE,CAAC;gBACZ,CAAC,CAAC,EAAE,CAAC;SACR;
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,12 +11,6 @@ const createStopJob = (context, jobDefinition) => {
|
|
|
11
11
|
needs: [], // can be executed even if the deploy job failed
|
|
12
12
|
allow_failure: true,
|
|
13
13
|
when: "manual", // stop is always manual
|
|
14
|
-
rules: [
|
|
15
|
-
{
|
|
16
|
-
if: "$CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/", // automatic on hotfix branches
|
|
17
|
-
when: "on_success",
|
|
18
|
-
},
|
|
19
|
-
],
|
|
20
14
|
variables: {
|
|
21
15
|
...context.environment.jobOnlyVars.deploy.envVars,
|
|
22
16
|
...jobDefinition.variables,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/stop.ts"],"names":[],"mappings":";;;AAIA,2CAAsD;AACzC,QAAA,aAAa,GAAG,YAAY,CAAC;AAEnC,MAAM,aAAa,GAAG,CAC3B,OAAyB,EACzB,aAAgC,EAClB,EAAE;IAChB,OAAO;QACL,IAAI,EAAE,qBAAa;QACnB,KAAK,EAAE,aAAa,CAAC,KAAK;QAC1B,OAAO,EAAE,aAAa,EAAE,6CAA6C;QACrE,KAAK,EAAE,EAAE,EAAE,gDAAgD;QAC3D,aAAa,EAAE,IAAI;QACnB,IAAI,EAAE,QAAQ,EAAE,wBAAwB;QACxC,
|
|
1
|
+
{"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/stop.ts"],"names":[],"mappings":";;;AAIA,2CAAsD;AACzC,QAAA,aAAa,GAAG,YAAY,CAAC;AAEnC,MAAM,aAAa,GAAG,CAC3B,OAAyB,EACzB,aAAgC,EAClB,EAAE;IAChB,OAAO;QACL,IAAI,EAAE,qBAAa;QACnB,KAAK,EAAE,aAAa,CAAC,KAAK;QAC1B,OAAO,EAAE,aAAa,EAAE,6CAA6C;QACrE,KAAK,EAAE,EAAE,EAAE,gDAAgD;QAC3D,aAAa,EAAE,IAAI;QACnB,IAAI,EAAE,QAAQ,EAAE,wBAAwB;QACxC,SAAS,EAAE;YACT,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO;YACjD,GAAG,aAAa,CAAC,SAAS;SAC3B;QACD,eAAe,EAAE;YACf,GAAG,mCAAuB;YAC1B,YAAY,EAAE,MAAM;YACpB,GAAG,aAAa,CAAC,eAAe;SACjC;QACD,KAAK,EAAE,MAAM;QACb,WAAW,EAAE;YACX,MAAM,EAAE,MAAM;SACf;QACD,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAC;AACJ,CAAC,CAAC;AA1BW,QAAA,aAAa,iBA0BxB"}
|