@catladder/cli 0.0.0-next-c177efda → 0.0.0-next-6ea918c7
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 +17 -5
- package/dist/bundles/cli/index.js +17 -5
- package/dist/pipeline/src/backends/github/GithubBackend.js +10 -3
- package/dist/pipeline/src/backends/github/GithubBackend.js.map +1 -1
- package/dist/pipeline/src/backends/gitlab/GitlabBackend.js +6 -1
- package/dist/pipeline/src/backends/gitlab/GitlabBackend.js.map +1 -1
- package/dist/pipeline/src/constants.js +1 -1
- package/dist/pipeline/src/types/config.d.ts +10 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1530,6 +1530,7 @@ const path_1 = __nccwpck_require__(16928);
|
|
|
1530
1530
|
const createAllJobs_1 = __nccwpck_require__(83671);
|
|
1531
1531
|
const config_1 = __nccwpck_require__(96925);
|
|
1532
1532
|
const ciVariables_1 = __nccwpck_require__(25474);
|
|
1533
|
+
const index_1 = __nccwpck_require__(93243);
|
|
1533
1534
|
const createGithubJobs_1 = __nccwpck_require__(14016);
|
|
1534
1535
|
const jobImagesPlan_1 = __nccwpck_require__(11585);
|
|
1535
1536
|
const scriptFunctions_1 = __nccwpck_require__(75759);
|
|
@@ -1607,6 +1608,12 @@ class GithubBackend {
|
|
|
1607
1608
|
*/
|
|
1608
1609
|
async createWorkflows(config, images = this.createImagesPlan(config), scripts = new scriptFiles_1.GithubScriptFiles()) {
|
|
1609
1610
|
const workflows = {};
|
|
1611
|
+
// per-pipeline-type variables (pipelines.github.runnerVariables);
|
|
1612
|
+
// workflow-level env, so job-level runnerVariables take precedence
|
|
1613
|
+
const workflowEnv = {
|
|
1614
|
+
...ciVariables_1.GITHUB_INJECTED_WORKFLOW_ENV,
|
|
1615
|
+
...(0, index_1.getPipelineOptions)(config, this.type).runnerVariables
|
|
1616
|
+
};
|
|
1610
1617
|
const reviewStopJobs = {};
|
|
1611
1618
|
const manualJobs = {};
|
|
1612
1619
|
for (const trigger of config_1.ALL_PIPELINE_TRIGGERS) {
|
|
@@ -1641,7 +1648,7 @@ class GithubBackend {
|
|
|
1641
1648
|
workflows[`${GENERATED_FILE_PREFIX}${workflowFileName(trigger)}`] = {
|
|
1642
1649
|
...TRIGGER_WORKFLOWS[trigger],
|
|
1643
1650
|
...workflowPermissions(images),
|
|
1644
|
-
env:
|
|
1651
|
+
env: workflowEnv,
|
|
1645
1652
|
jobs: {
|
|
1646
1653
|
...makeEnsureImageGithubJobs(images),
|
|
1647
1654
|
...jobs
|
|
@@ -1658,7 +1665,7 @@ class GithubBackend {
|
|
|
1658
1665
|
}
|
|
1659
1666
|
},
|
|
1660
1667
|
...workflowPermissions(images),
|
|
1661
|
-
env:
|
|
1668
|
+
env: workflowEnv,
|
|
1662
1669
|
jobs: {
|
|
1663
1670
|
...makeEnsureImageGithubJobs(images),
|
|
1664
1671
|
...reviewStopJobs
|
|
@@ -1681,7 +1688,7 @@ class GithubBackend {
|
|
|
1681
1688
|
}
|
|
1682
1689
|
},
|
|
1683
1690
|
...workflowPermissions(images),
|
|
1684
|
-
env:
|
|
1691
|
+
env: workflowEnv,
|
|
1685
1692
|
jobs: {
|
|
1686
1693
|
...makeEnsureImageGithubJobs(images),
|
|
1687
1694
|
...Object.fromEntries(Object.entries(manualJobs).map(([id, job]) => [id, {
|
|
@@ -2303,6 +2310,7 @@ const config_1 = __nccwpck_require__(96925);
|
|
|
2303
2310
|
const createAllJobs_1 = __nccwpck_require__(83671);
|
|
2304
2311
|
const jobImagesPlan_1 = __nccwpck_require__(11585);
|
|
2305
2312
|
const shippedCatci_1 = __nccwpck_require__(93401);
|
|
2313
|
+
const index_1 = __nccwpck_require__(93243);
|
|
2306
2314
|
const createGitlabJobs_1 = __nccwpck_require__(80512);
|
|
2307
2315
|
const createGitlabPipeline_1 = __nccwpck_require__(61862);
|
|
2308
2316
|
const gitlabReleaseJobs_1 = __nccwpck_require__(35531);
|
|
@@ -2466,7 +2474,11 @@ class GitlabBackend {
|
|
|
2466
2474
|
context: null
|
|
2467
2475
|
}]))
|
|
2468
2476
|
},
|
|
2469
|
-
variables:
|
|
2477
|
+
variables: {
|
|
2478
|
+
...config.runnerVariables,
|
|
2479
|
+
// per-pipeline-type variables (pipelines.gitlab.runnerVariables)
|
|
2480
|
+
...(0, index_1.getPipelineOptions)(config, this.type).runnerVariables
|
|
2481
|
+
}
|
|
2470
2482
|
});
|
|
2471
2483
|
}
|
|
2472
2484
|
}
|
|
@@ -5212,7 +5224,7 @@ Object.defineProperty(exports, "__esModule", ({
|
|
|
5212
5224
|
value: true
|
|
5213
5225
|
}));
|
|
5214
5226
|
exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
|
|
5215
|
-
exports.PIPELINE_IMAGE_TAG = "next-
|
|
5227
|
+
exports.PIPELINE_IMAGE_TAG = "next-6ea918c7" || 0;
|
|
5216
5228
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
|
|
5217
5229
|
|
|
5218
5230
|
/***/ }),
|
|
@@ -6781,6 +6781,7 @@ const path_1 = __nccwpck_require__(16928);
|
|
|
6781
6781
|
const createAllJobs_1 = __nccwpck_require__(83671);
|
|
6782
6782
|
const config_1 = __nccwpck_require__(96925);
|
|
6783
6783
|
const ciVariables_1 = __nccwpck_require__(25474);
|
|
6784
|
+
const index_1 = __nccwpck_require__(93243);
|
|
6784
6785
|
const createGithubJobs_1 = __nccwpck_require__(14016);
|
|
6785
6786
|
const jobImagesPlan_1 = __nccwpck_require__(11585);
|
|
6786
6787
|
const scriptFunctions_1 = __nccwpck_require__(75759);
|
|
@@ -6858,6 +6859,12 @@ class GithubBackend {
|
|
|
6858
6859
|
*/
|
|
6859
6860
|
async createWorkflows(config, images = this.createImagesPlan(config), scripts = new scriptFiles_1.GithubScriptFiles()) {
|
|
6860
6861
|
const workflows = {};
|
|
6862
|
+
// per-pipeline-type variables (pipelines.github.runnerVariables);
|
|
6863
|
+
// workflow-level env, so job-level runnerVariables take precedence
|
|
6864
|
+
const workflowEnv = {
|
|
6865
|
+
...ciVariables_1.GITHUB_INJECTED_WORKFLOW_ENV,
|
|
6866
|
+
...(0, index_1.getPipelineOptions)(config, this.type).runnerVariables
|
|
6867
|
+
};
|
|
6861
6868
|
const reviewStopJobs = {};
|
|
6862
6869
|
const manualJobs = {};
|
|
6863
6870
|
for (const trigger of config_1.ALL_PIPELINE_TRIGGERS) {
|
|
@@ -6892,7 +6899,7 @@ class GithubBackend {
|
|
|
6892
6899
|
workflows[`${GENERATED_FILE_PREFIX}${workflowFileName(trigger)}`] = {
|
|
6893
6900
|
...TRIGGER_WORKFLOWS[trigger],
|
|
6894
6901
|
...workflowPermissions(images),
|
|
6895
|
-
env:
|
|
6902
|
+
env: workflowEnv,
|
|
6896
6903
|
jobs: {
|
|
6897
6904
|
...makeEnsureImageGithubJobs(images),
|
|
6898
6905
|
...jobs
|
|
@@ -6909,7 +6916,7 @@ class GithubBackend {
|
|
|
6909
6916
|
}
|
|
6910
6917
|
},
|
|
6911
6918
|
...workflowPermissions(images),
|
|
6912
|
-
env:
|
|
6919
|
+
env: workflowEnv,
|
|
6913
6920
|
jobs: {
|
|
6914
6921
|
...makeEnsureImageGithubJobs(images),
|
|
6915
6922
|
...reviewStopJobs
|
|
@@ -6932,7 +6939,7 @@ class GithubBackend {
|
|
|
6932
6939
|
}
|
|
6933
6940
|
},
|
|
6934
6941
|
...workflowPermissions(images),
|
|
6935
|
-
env:
|
|
6942
|
+
env: workflowEnv,
|
|
6936
6943
|
jobs: {
|
|
6937
6944
|
...makeEnsureImageGithubJobs(images),
|
|
6938
6945
|
...Object.fromEntries(Object.entries(manualJobs).map(([id, job]) => [id, {
|
|
@@ -7554,6 +7561,7 @@ const config_1 = __nccwpck_require__(96925);
|
|
|
7554
7561
|
const createAllJobs_1 = __nccwpck_require__(83671);
|
|
7555
7562
|
const jobImagesPlan_1 = __nccwpck_require__(11585);
|
|
7556
7563
|
const shippedCatci_1 = __nccwpck_require__(93401);
|
|
7564
|
+
const index_1 = __nccwpck_require__(93243);
|
|
7557
7565
|
const createGitlabJobs_1 = __nccwpck_require__(80512);
|
|
7558
7566
|
const createGitlabPipeline_1 = __nccwpck_require__(61862);
|
|
7559
7567
|
const gitlabReleaseJobs_1 = __nccwpck_require__(35531);
|
|
@@ -7717,7 +7725,11 @@ class GitlabBackend {
|
|
|
7717
7725
|
context: null
|
|
7718
7726
|
}]))
|
|
7719
7727
|
},
|
|
7720
|
-
variables:
|
|
7728
|
+
variables: {
|
|
7729
|
+
...config.runnerVariables,
|
|
7730
|
+
// per-pipeline-type variables (pipelines.gitlab.runnerVariables)
|
|
7731
|
+
...(0, index_1.getPipelineOptions)(config, this.type).runnerVariables
|
|
7732
|
+
}
|
|
7721
7733
|
});
|
|
7722
7734
|
}
|
|
7723
7735
|
}
|
|
@@ -10463,7 +10475,7 @@ Object.defineProperty(exports, "__esModule", ({
|
|
|
10463
10475
|
value: true
|
|
10464
10476
|
}));
|
|
10465
10477
|
exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
|
|
10466
|
-
exports.PIPELINE_IMAGE_TAG = "next-
|
|
10478
|
+
exports.PIPELINE_IMAGE_TAG = "next-6ea918c7" || 0;
|
|
10467
10479
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
|
|
10468
10480
|
|
|
10469
10481
|
/***/ }),
|
|
@@ -9,6 +9,7 @@ const path_1 = require("path");
|
|
|
9
9
|
const createAllJobs_1 = require("../../pipeline/createAllJobs");
|
|
10
10
|
const config_1 = require("../../types/config");
|
|
11
11
|
const ciVariables_1 = require("./ciVariables");
|
|
12
|
+
const index_1 = require("../index");
|
|
12
13
|
const createGithubJobs_1 = require("./createGithubJobs");
|
|
13
14
|
const jobImagesPlan_1 = require("../../customImages/jobImagesPlan");
|
|
14
15
|
const scriptFunctions_1 = require("./scriptFunctions");
|
|
@@ -86,6 +87,12 @@ class GithubBackend {
|
|
|
86
87
|
*/
|
|
87
88
|
async createWorkflows(config, images = this.createImagesPlan(config), scripts = new scriptFiles_1.GithubScriptFiles()) {
|
|
88
89
|
const workflows = {};
|
|
90
|
+
// per-pipeline-type variables (pipelines.github.runnerVariables);
|
|
91
|
+
// workflow-level env, so job-level runnerVariables take precedence
|
|
92
|
+
const workflowEnv = {
|
|
93
|
+
...ciVariables_1.GITHUB_INJECTED_WORKFLOW_ENV,
|
|
94
|
+
...(0, index_1.getPipelineOptions)(config, this.type).runnerVariables
|
|
95
|
+
};
|
|
89
96
|
const reviewStopJobs = {};
|
|
90
97
|
const manualJobs = {};
|
|
91
98
|
for (const trigger of config_1.ALL_PIPELINE_TRIGGERS) {
|
|
@@ -120,7 +127,7 @@ class GithubBackend {
|
|
|
120
127
|
workflows[`${GENERATED_FILE_PREFIX}${workflowFileName(trigger)}`] = {
|
|
121
128
|
...TRIGGER_WORKFLOWS[trigger],
|
|
122
129
|
...workflowPermissions(images),
|
|
123
|
-
env:
|
|
130
|
+
env: workflowEnv,
|
|
124
131
|
jobs: {
|
|
125
132
|
...makeEnsureImageGithubJobs(images),
|
|
126
133
|
...jobs
|
|
@@ -137,7 +144,7 @@ class GithubBackend {
|
|
|
137
144
|
}
|
|
138
145
|
},
|
|
139
146
|
...workflowPermissions(images),
|
|
140
|
-
env:
|
|
147
|
+
env: workflowEnv,
|
|
141
148
|
jobs: {
|
|
142
149
|
...makeEnsureImageGithubJobs(images),
|
|
143
150
|
...reviewStopJobs
|
|
@@ -160,7 +167,7 @@ class GithubBackend {
|
|
|
160
167
|
}
|
|
161
168
|
},
|
|
162
169
|
...workflowPermissions(images),
|
|
163
|
-
env:
|
|
170
|
+
env: workflowEnv,
|
|
164
171
|
jobs: {
|
|
165
172
|
...makeEnsureImageGithubJobs(images),
|
|
166
173
|
...Object.fromEntries(Object.entries(manualJobs).map(([id, job]) => [id, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GithubBackend.js","sourceRoot":"","sources":["../../../../../../pipeline/src/backends/github/GithubBackend.ts"],"names":[],"mappings":";;;AAAA,0CAAkD;AAClD,+BAA4B;AAC5B,gEAA6D;AAE7D,+CAA2D;AAI3D,+CAA6D;AAC7D,yDAK4B;AAC5B,oEAG0C;AAC1C,uDAAuE;AACvE,2DAAkE;AAClE,uCAAqC;AACrC,2DAA2D;AAC3D,+CAAyE;AAEzE,MAAM,gBAAgB,GAAG,mBAAmB,CAAC;AAE7C;;;GAGG;AACH,MAAM,qBAAqB,GAAG,YAAY,CAAC;AAE3C,MAAM,iBAAiB,GAGnB;IACF,EAAE,EAAE;QACF,IAAI,EAAE,kBAAkB;QACxB,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,UAAU,CAAC,EAAE,EAAE;QACtE,WAAW,EAAE;YACX,KAAK,EAAE,6CAA6C;YACpD,oBAAoB,EAAE,IAAI;SAC3B;KACF;IACD,UAAU,EAAE;QACV,IAAI,EAAE,gBAAgB;QACtB,6CAA6C;QAC7C,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE;KACrC;IACD,aAAa,EAAE;QACb,IAAI,EAAE,mBAAmB;QACzB,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE;KAC/B;CACF,CAAC;AAEF,MAAa,aAAa;IAA1B;QACW,SAAI,GAAG,QAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"GithubBackend.js","sourceRoot":"","sources":["../../../../../../pipeline/src/backends/github/GithubBackend.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const config_1 = require("../../types/config");
|
|
|
10
10
|
const createAllJobs_1 = require("../../pipeline/createAllJobs");
|
|
11
11
|
const jobImagesPlan_1 = require("../../customImages/jobImagesPlan");
|
|
12
12
|
const shippedCatci_1 = require("../../catci/shippedCatci");
|
|
13
|
+
const index_1 = require("../index");
|
|
13
14
|
const createGitlabJobs_1 = require("./createGitlabJobs");
|
|
14
15
|
const createGitlabPipeline_1 = require("./createGitlabPipeline");
|
|
15
16
|
const gitlabReleaseJobs_1 = require("./gitlabReleaseJobs");
|
|
@@ -173,7 +174,11 @@ class GitlabBackend {
|
|
|
173
174
|
context: null
|
|
174
175
|
}]))
|
|
175
176
|
},
|
|
176
|
-
variables:
|
|
177
|
+
variables: {
|
|
178
|
+
...config.runnerVariables,
|
|
179
|
+
// per-pipeline-type variables (pipelines.gitlab.runnerVariables)
|
|
180
|
+
...(0, index_1.getPipelineOptions)(config, this.type).runnerVariables
|
|
181
|
+
}
|
|
177
182
|
});
|
|
178
183
|
}
|
|
179
184
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GitlabBackend.js","sourceRoot":"","sources":["../../../../../../pipeline/src/backends/gitlab/GitlabBackend.ts"],"names":[],"mappings":";;;AAAA,0CAAiC;AACjC,uCAKqB;AAUrB,+CAA2D;AAC3D,gEAA6D;AAC7D,oEAG0C;AAC1C,2DAAkE;
|
|
1
|
+
{"version":3,"file":"GitlabBackend.js","sourceRoot":"","sources":["../../../../../../pipeline/src/backends/gitlab/GitlabBackend.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
|
|
7
|
-
exports.PIPELINE_IMAGE_TAG = "next-
|
|
7
|
+
exports.PIPELINE_IMAGE_TAG = "next-6ea918c7" || "latest";
|
|
8
8
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";
|
|
@@ -181,6 +181,16 @@ export type PipelineOutputOptions = {
|
|
|
181
181
|
* defaults to "origin"
|
|
182
182
|
*/
|
|
183
183
|
gitRemote?: string;
|
|
184
|
+
/**
|
|
185
|
+
* variables applied to every job of THIS pipeline type only —
|
|
186
|
+
* lowered to gitlab's pipeline-level `variables:` / github's
|
|
187
|
+
* workflow-level `env:`, so job-level `runnerVariables` take
|
|
188
|
+
* precedence.
|
|
189
|
+
*
|
|
190
|
+
* Useful when the CI systems need different values, e.g. a lower
|
|
191
|
+
* `TURBO_CONCURRENCY` for github's small hosted runners.
|
|
192
|
+
*/
|
|
193
|
+
runnerVariables?: Record<string, string>;
|
|
184
194
|
};
|
|
185
195
|
/**
|
|
186
196
|
* where secret values are stored and edited (the readable source of
|