@catladder/cli 0.0.0-main-2270956d → 0.0.0-main-e126076c
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 +2 -2
- package/dist/bundles/cli/index.js +12 -8
- package/dist/cli/src/adapters/terminal.js +10 -6
- package/dist/cli/src/adapters/terminal.js.map +1 -1
- package/dist/pipeline/src/build/docker.js +1 -1
- package/dist/pipeline/src/constants.js +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/adapters/terminal.ts +12 -7
|
@@ -1932,7 +1932,7 @@ const getDockerJobBaseProps = () => {
|
|
|
1932
1932
|
return {
|
|
1933
1933
|
image: (0, runner_1.getRunnerImage)("docker-build"),
|
|
1934
1934
|
services: [{
|
|
1935
|
-
name: "docker:
|
|
1935
|
+
name: "docker:29.5.1-dind",
|
|
1936
1936
|
// see see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27300#note_466755332
|
|
1937
1937
|
command: ["--tls=false", "--registry-mirror=https://mirror.gcr.io"]
|
|
1938
1938
|
}],
|
|
@@ -2824,7 +2824,7 @@ Object.defineProperty(exports, "__esModule", ({
|
|
|
2824
2824
|
value: true
|
|
2825
2825
|
}));
|
|
2826
2826
|
exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
|
|
2827
|
-
exports.PIPELINE_IMAGE_TAG = "main-
|
|
2827
|
+
exports.PIPELINE_IMAGE_TAG = "main-e126076c" || 0;
|
|
2828
2828
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
|
|
2829
2829
|
|
|
2830
2830
|
/***/ }),
|
|
@@ -199,18 +199,22 @@ class TerminalContext extends baseContext_1.BaseContext {
|
|
|
199
199
|
await validateAgainstChoices(jsonInputs[name]);
|
|
200
200
|
return jsonInputs[name];
|
|
201
201
|
}
|
|
202
|
-
// 3.
|
|
202
|
+
// 3. Default (check before prompting, so optional inputs with defaults don't prompt)
|
|
203
|
+
if ("default" in spec && spec.default !== undefined) {
|
|
204
|
+
return spec.default;
|
|
205
|
+
}
|
|
206
|
+
// 4. Optional inputs: don't prompt, throw so baseContext returns undefined
|
|
207
|
+
if (spec.required === false) {
|
|
208
|
+
throw new types_1.MissingInputError(name, spec.message);
|
|
209
|
+
}
|
|
210
|
+
// 5. Interactive prompt
|
|
203
211
|
if (isInteractive) {
|
|
204
212
|
return promptInteractive({
|
|
205
213
|
...spec,
|
|
206
214
|
name
|
|
207
215
|
}, this);
|
|
208
216
|
}
|
|
209
|
-
//
|
|
210
|
-
if ("default" in spec && spec.default !== undefined) {
|
|
211
|
-
return spec.default;
|
|
212
|
-
}
|
|
213
|
-
// 5. Throw
|
|
217
|
+
// 6. Throw
|
|
214
218
|
throw new types_1.MissingInputError(name, spec.message);
|
|
215
219
|
}
|
|
216
220
|
}
|
|
@@ -6734,7 +6738,7 @@ const getDockerJobBaseProps = () => {
|
|
|
6734
6738
|
return {
|
|
6735
6739
|
image: (0, runner_1.getRunnerImage)("docker-build"),
|
|
6736
6740
|
services: [{
|
|
6737
|
-
name: "docker:
|
|
6741
|
+
name: "docker:29.5.1-dind",
|
|
6738
6742
|
// see see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27300#note_466755332
|
|
6739
6743
|
command: ["--tls=false", "--registry-mirror=https://mirror.gcr.io"]
|
|
6740
6744
|
}],
|
|
@@ -7626,7 +7630,7 @@ Object.defineProperty(exports, "__esModule", ({
|
|
|
7626
7630
|
value: true
|
|
7627
7631
|
}));
|
|
7628
7632
|
exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
|
|
7629
|
-
exports.PIPELINE_IMAGE_TAG = "main-
|
|
7633
|
+
exports.PIPELINE_IMAGE_TAG = "main-e126076c" || 0;
|
|
7630
7634
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
|
|
7631
7635
|
|
|
7632
7636
|
/***/ }),
|
|
@@ -145,18 +145,22 @@ class TerminalContext extends baseContext_1.BaseContext {
|
|
|
145
145
|
await validateAgainstChoices(jsonInputs[name]);
|
|
146
146
|
return jsonInputs[name];
|
|
147
147
|
}
|
|
148
|
-
// 3.
|
|
148
|
+
// 3. Default (check before prompting, so optional inputs with defaults don't prompt)
|
|
149
|
+
if ("default" in spec && spec.default !== undefined) {
|
|
150
|
+
return spec.default;
|
|
151
|
+
}
|
|
152
|
+
// 4. Optional inputs: don't prompt, throw so baseContext returns undefined
|
|
153
|
+
if (spec.required === false) {
|
|
154
|
+
throw new types_1.MissingInputError(name, spec.message);
|
|
155
|
+
}
|
|
156
|
+
// 5. Interactive prompt
|
|
149
157
|
if (isInteractive) {
|
|
150
158
|
return promptInteractive({
|
|
151
159
|
...spec,
|
|
152
160
|
name
|
|
153
161
|
}, this);
|
|
154
162
|
}
|
|
155
|
-
//
|
|
156
|
-
if ("default" in spec && spec.default !== undefined) {
|
|
157
|
-
return spec.default;
|
|
158
|
-
}
|
|
159
|
-
// 5. Throw
|
|
163
|
+
// 6. Throw
|
|
160
164
|
throw new types_1.MissingInputError(name, spec.message);
|
|
161
165
|
}
|
|
162
166
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../../../src/adapters/terminal.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../../../src/adapters/terminal.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,7 +84,7 @@ const getDockerJobBaseProps = () => {
|
|
|
84
84
|
return {
|
|
85
85
|
image: (0, runner_1.getRunnerImage)("docker-build"),
|
|
86
86
|
services: [{
|
|
87
|
-
name: "docker:
|
|
87
|
+
name: "docker:29.5.1-dind",
|
|
88
88
|
// see see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27300#note_466755332
|
|
89
89
|
command: ["--tls=false", "--registry-mirror=https://mirror.gcr.io"]
|
|
90
90
|
}],
|
|
@@ -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 = "main-
|
|
7
|
+
exports.PIPELINE_IMAGE_TAG = "main-e126076c" || "latest";
|
|
8
8
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";
|