@git.zone/cli 9.2.1 → 10.0.0
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/assets/templates/asset_binary_installer/install.sh +109 -34
- package/assets/templates/asset_binary_release_gitea/.gitea/workflows/release.yml +20 -6
- package/assets/templates/ci_rust/.gitea/workflows/rust_nottags.yaml +29 -0
- package/assets/templates/ci_rust/.gitea/workflows/rust_tags.yaml +32 -0
- package/assets/templates/gitignore/_gitignore +1 -1
- package/assets/templates/gitignore_rust/_gitignore +31 -0
- package/assets/templates/license_mit/license +4 -1
- package/assets/templates/rust/.smartscaf.yml +16 -0
- package/assets/templates/rust/_Cargo.toml +12 -0
- package/assets/templates/rust/_crate_Cargo.toml +10 -0
- package/assets/templates/rust/_crate_lib.rs +19 -0
- package/assets/templates/rust/_smartconfig.json +27 -0
- package/assets/templates/rust/readme.md +23 -0
- package/dist_ts/00_commitinfo_data.js +2 -2
- package/dist_ts/classes.gitzoneconfig.d.ts +3 -1
- package/dist_ts/classes.gitzoneconfig.js +9 -1
- package/dist_ts/helpers.managedassets.d.ts +1 -1
- package/dist_ts/helpers.managedassets.js +58 -14
- package/dist_ts/helpers.releasetargets.d.ts +6 -0
- package/dist_ts/helpers.releasetargets.js +13 -0
- package/dist_ts/helpers.smartconfigmigrations.js +42 -1
- package/dist_ts/helpers.toolconfig.d.ts +50 -0
- package/dist_ts/helpers.toolconfig.js +212 -0
- package/dist_ts/helpers.tssea.d.ts +9 -2
- package/dist_ts/helpers.tssea.js +47 -17
- package/dist_ts/helpers.tstest.d.ts +27 -8
- package/dist_ts/helpers.tstest.js +64 -26
- package/dist_ts/helpers.versionsource.d.ts +37 -0
- package/dist_ts/helpers.versionsource.js +112 -0
- package/dist_ts/helpers.workflow.d.ts +45 -1
- package/dist_ts/helpers.workflow.js +120 -5
- package/dist_ts/mod_commit/mod.helpers.d.ts +0 -24
- package/dist_ts/mod_commit/mod.helpers.js +1 -94
- package/dist_ts/mod_config/index.js +131 -18
- package/dist_ts/mod_format/formatters/assets.formatter.js +29 -27
- package/dist_ts/mod_format/formatters/gitignore.formatter.d.ts +4 -2
- package/dist_ts/mod_format/formatters/gitignore.formatter.js +10 -7
- package/dist_ts/mod_format/formatters/license.formatter.d.ts +8 -0
- package/dist_ts/mod_format/formatters/license.formatter.js +25 -2
- package/dist_ts/mod_format/formatters/packagejson.formatter.js +14 -3
- package/dist_ts/mod_format/formatters/rustfmt.formatter.d.ts +19 -0
- package/dist_ts/mod_format/formatters/rustfmt.formatter.js +97 -0
- package/dist_ts/mod_format/formatters/smartconfig.formatter.js +5 -2
- package/dist_ts/mod_format/index.js +3 -1
- package/dist_ts/mod_format/interfaces.format.js +2 -1
- package/dist_ts/mod_release/classes.releasejournal.d.ts +38 -2
- package/dist_ts/mod_release/classes.releasejournal.js +238 -66
- package/dist_ts/mod_release/helpers.cargorelease.d.ts +52 -0
- package/dist_ts/mod_release/helpers.cargorelease.js +195 -0
- package/dist_ts/mod_release/helpers.npmpackages.d.ts +18 -0
- package/dist_ts/mod_release/helpers.npmpackages.js +40 -2
- package/dist_ts/mod_release/helpers.releasecheck.d.ts +73 -0
- package/dist_ts/mod_release/helpers.releasecheck.js +269 -0
- package/dist_ts/mod_release/helpers.releasepreparation.d.ts +22 -8
- package/dist_ts/mod_release/helpers.releasepreparation.js +74 -26
- package/dist_ts/mod_release/helpers.releasepublication.d.ts +21 -1
- package/dist_ts/mod_release/helpers.releasepublication.js +249 -4
- package/dist_ts/mod_release/helpers.releaseversionsource.d.ts +10 -0
- package/dist_ts/mod_release/helpers.releaseversionsource.js +18 -0
- package/dist_ts/mod_release/helpers.rsrepoengine.d.ts +192 -0
- package/dist_ts/mod_release/helpers.rsrepoengine.js +457 -0
- package/dist_ts/mod_release/index.d.ts +3 -0
- package/dist_ts/mod_release/index.js +177 -65
- package/dist_ts/mod_template/index.js +6 -2
- package/package.json +1 -1
- package/readme.md +237 -21
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.gitzoneconfig.ts +10 -1
- package/ts/helpers.managedassets.ts +64 -14
- package/ts/helpers.releasetargets.ts +13 -0
- package/ts/helpers.smartconfigmigrations.ts +48 -0
- package/ts/helpers.toolconfig.ts +280 -0
- package/ts/helpers.tssea.ts +59 -16
- package/ts/helpers.tstest.ts +105 -35
- package/ts/helpers.versionsource.ts +169 -0
- package/ts/helpers.workflow.ts +197 -5
- package/ts/mod_commit/mod.helpers.ts +0 -119
- package/ts/mod_config/index.ts +169 -19
- package/ts/mod_format/formatters/assets.formatter.ts +28 -27
- package/ts/mod_format/formatters/gitignore.formatter.ts +10 -6
- package/ts/mod_format/formatters/license.formatter.ts +26 -1
- package/ts/mod_format/formatters/packagejson.formatter.ts +14 -2
- package/ts/mod_format/formatters/rustfmt.formatter.ts +107 -0
- package/ts/mod_format/formatters/smartconfig.formatter.ts +8 -1
- package/ts/mod_format/index.ts +2 -0
- package/ts/mod_format/interfaces.format.ts +1 -0
- package/ts/mod_release/classes.releasejournal.ts +312 -39
- package/ts/mod_release/helpers.cargorelease.ts +289 -0
- package/ts/mod_release/helpers.npmpackages.ts +76 -1
- package/ts/mod_release/helpers.releasecheck.ts +409 -0
- package/ts/mod_release/helpers.releasepreparation.ts +116 -36
- package/ts/mod_release/helpers.releasepublication.ts +462 -1
- package/ts/mod_release/helpers.releaseversionsource.ts +29 -0
- package/ts/mod_release/helpers.rsrepoengine.ts +790 -0
- package/ts/mod_release/index.ts +277 -84
- package/ts/mod_template/index.ts +5 -1
|
@@ -0,0 +1,269 @@
|
|
|
1
|
+
import * as plugins from "./mod.plugins.js";
|
|
2
|
+
import { assertPackageJsonFilesCurrent } from "../helpers.packagefiles.js";
|
|
3
|
+
import { releaseGitEnv } from "./helpers.releasebranch.js";
|
|
4
|
+
import { formatCommandFailure } from "./helpers.commandfailure.js";
|
|
5
|
+
import { assertPnpmReleaseCapability, packNpmArtifact, } from "./helpers.npmartifact.js";
|
|
6
|
+
import { readNpmArtifactContents, verifyPackedNpmArtifacts, } from "./helpers.npmartifactcheck.js";
|
|
7
|
+
import { packReleaseNpmModules, planReleaseNpmPackages, } from "./helpers.npmpackages.js";
|
|
8
|
+
import { describeCargoReleasePlan, describePackedCrates, findCargoReleaseProblems, openCargoReleaseEngine, readCargoReleasePlan, } from "./helpers.cargorelease.js";
|
|
9
|
+
import { withIsolatedReleaseCheckout } from "./helpers.releasepreparation.js";
|
|
10
|
+
import { openReleaseVersionSource } from "./helpers.releaseversionsource.js";
|
|
11
|
+
import { printReleasePhase } from "./helpers.releasephase.js";
|
|
12
|
+
const messageOf = (errorArg) => errorArg instanceof Error ? errorArg.message : String(errorArg);
|
|
13
|
+
const checkGit = async (optionsArg, argsArg) => optionsArg.smartshell.execSpawn("git", argsArg, {
|
|
14
|
+
cwd: optionsArg.cwd,
|
|
15
|
+
env: releaseGitEnv,
|
|
16
|
+
silent: true,
|
|
17
|
+
timeout: 60_000,
|
|
18
|
+
timeoutKillGraceMs: 5_000,
|
|
19
|
+
});
|
|
20
|
+
const notCheckedReasons = {
|
|
21
|
+
docker: "tSDocker builds and qualifies the images during the release; `release check` packs no image",
|
|
22
|
+
giteaAssets: "the Gitea asset manifest is frozen during the release; `release check` uploads and freezes nothing",
|
|
23
|
+
};
|
|
24
|
+
/**
|
|
25
|
+
* Packs the npm packages of the checkout, verifies each tarball like a
|
|
26
|
+
* release does, and lists what each carries.
|
|
27
|
+
*/
|
|
28
|
+
const checkNpmPackages = async (optionsArg, checkoutPathArg, preparationPathArg, artifactDirectoryArg, capabilityArg) => {
|
|
29
|
+
const { packageSet, plan } = await planReleaseNpmPackages(checkoutPathArg);
|
|
30
|
+
const artifacts = [];
|
|
31
|
+
if (plan.modules.length > 0) {
|
|
32
|
+
printReleasePhase("Packing the tspublish modules");
|
|
33
|
+
const modules = await packReleaseNpmModules({
|
|
34
|
+
smartshell: optionsArg.smartshell,
|
|
35
|
+
preparationDirectory: preparationPathArg,
|
|
36
|
+
version: plan.version,
|
|
37
|
+
pnpmCapability: capabilityArg,
|
|
38
|
+
}, checkoutPathArg, plan, artifactDirectoryArg);
|
|
39
|
+
artifacts.push(...modules.map((moduleArg) => moduleArg.artifact));
|
|
40
|
+
}
|
|
41
|
+
if (!packageSet.root.private) {
|
|
42
|
+
printReleasePhase("Packing the root package");
|
|
43
|
+
artifacts.push(await packNpmArtifact(optionsArg.smartshell, checkoutPathArg, artifactDirectoryArg, plan.version, capabilityArg));
|
|
44
|
+
}
|
|
45
|
+
printReleasePhase("Checking the packed npm artifacts");
|
|
46
|
+
await verifyPackedNpmArtifacts({
|
|
47
|
+
workflow: optionsArg.workflow,
|
|
48
|
+
artifactDirectory: artifactDirectoryArg,
|
|
49
|
+
artifacts,
|
|
50
|
+
log: optionsArg.log,
|
|
51
|
+
});
|
|
52
|
+
const packages = [];
|
|
53
|
+
for (const artifact of artifacts) {
|
|
54
|
+
const contents = await readNpmArtifactContents(plugins.path.join(artifactDirectoryArg, artifact.file));
|
|
55
|
+
packages.push({
|
|
56
|
+
packageName: artifact.packageName,
|
|
57
|
+
version: artifact.version,
|
|
58
|
+
size: artifact.size,
|
|
59
|
+
sha256: artifact.sha256,
|
|
60
|
+
integrity: artifact.integrity,
|
|
61
|
+
files: [...contents.files].sort(),
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
for (const entry of packages) {
|
|
65
|
+
optionsArg.log(`npm package ${entry.packageName}@${entry.version}: ${entry.files.length} files, ${entry.size} bytes, sha256 ${entry.sha256}`);
|
|
66
|
+
for (const file of entry.files)
|
|
67
|
+
optionsArg.log(` ${file}`);
|
|
68
|
+
}
|
|
69
|
+
return packages;
|
|
70
|
+
};
|
|
71
|
+
/**
|
|
72
|
+
* Reads the workspace plan of the checkout, reports every problem a release
|
|
73
|
+
* would refuse, and packs the crates the release would publish.
|
|
74
|
+
*/
|
|
75
|
+
const checkCargoCrates = async (optionsArg, checkoutPathArg, artifactDirectoryArg, reportArg) => {
|
|
76
|
+
const cargo = optionsArg.workflow.cargo;
|
|
77
|
+
if (!cargo)
|
|
78
|
+
throw new Error("The cargo target has no resolved configuration.");
|
|
79
|
+
const engine = await openCargoReleaseEngine(optionsArg.smartshell, checkoutPathArg);
|
|
80
|
+
const plan = await readCargoReleasePlan(engine, checkoutPathArg, cargo);
|
|
81
|
+
const planLines = describeCargoReleasePlan(plan, cargo);
|
|
82
|
+
for (const line of planLines)
|
|
83
|
+
optionsArg.log(line);
|
|
84
|
+
reportArg.cargo = {
|
|
85
|
+
registries: cargo.registries,
|
|
86
|
+
order: plan.order,
|
|
87
|
+
plan: planLines,
|
|
88
|
+
crates: [],
|
|
89
|
+
};
|
|
90
|
+
for (const problem of findCargoReleaseProblems(plan, cargo))
|
|
91
|
+
reportArg.problems.push({ area: "cargo", message: problem });
|
|
92
|
+
if (plan.order.length === 0)
|
|
93
|
+
return;
|
|
94
|
+
printReleasePhase(`Packing the crates ${plan.order.join(", ")}`);
|
|
95
|
+
const packed = await engine.package({
|
|
96
|
+
cwd: checkoutPathArg,
|
|
97
|
+
outDir: artifactDirectoryArg,
|
|
98
|
+
members: plan.order,
|
|
99
|
+
});
|
|
100
|
+
for (const line of describePackedCrates(packed.crates))
|
|
101
|
+
optionsArg.log(line);
|
|
102
|
+
reportArg.cargo.crates = packed.crates.map(({ name, version, sha256, files }) => ({
|
|
103
|
+
name,
|
|
104
|
+
version,
|
|
105
|
+
sha256,
|
|
106
|
+
files,
|
|
107
|
+
}));
|
|
108
|
+
};
|
|
109
|
+
/**
|
|
110
|
+
* `gitzone release check`: everything a release builds and packs, without
|
|
111
|
+
* creating anything. It needs a clean working tree and a version source the
|
|
112
|
+
* release accepts, checks out HEAD into a
|
|
113
|
+
* disposable worktree exactly as a release checks out its release commit
|
|
114
|
+
* (npm install or `cargo fetch --locked`), runs the configured release build
|
|
115
|
+
* there, packs and verifies the npm packages and the crates of the active
|
|
116
|
+
* targets, and removes the checkout and every artifact again. It never
|
|
117
|
+
* changes the version, commits, tags, writes a journal or publishes.
|
|
118
|
+
*/
|
|
119
|
+
export const runReleaseCheck = async (optionsArg) => {
|
|
120
|
+
const { workflow } = optionsArg;
|
|
121
|
+
const report = {
|
|
122
|
+
ok: false,
|
|
123
|
+
sourceOid: null,
|
|
124
|
+
targets: workflow.targets,
|
|
125
|
+
build: null,
|
|
126
|
+
notChecked: workflow.targets.flatMap((target) => {
|
|
127
|
+
const reason = notCheckedReasons[target];
|
|
128
|
+
return reason ? [{ target, reason }] : [];
|
|
129
|
+
}),
|
|
130
|
+
problems: [],
|
|
131
|
+
};
|
|
132
|
+
const finish = () => {
|
|
133
|
+
report.ok = report.problems.length === 0;
|
|
134
|
+
return report;
|
|
135
|
+
};
|
|
136
|
+
const head = await checkGit(optionsArg, ["rev-parse", "--verify", "HEAD"]);
|
|
137
|
+
if (head.exitCode !== 0) {
|
|
138
|
+
report.problems.push({
|
|
139
|
+
area: "tree",
|
|
140
|
+
message: formatCommandFailure("The working tree has no HEAD commit to check.", head, {
|
|
141
|
+
command: "git rev-parse",
|
|
142
|
+
timeoutMs: 60_000,
|
|
143
|
+
}),
|
|
144
|
+
});
|
|
145
|
+
return finish();
|
|
146
|
+
}
|
|
147
|
+
report.sourceOid = head.stdout.trim();
|
|
148
|
+
const status = await checkGit(optionsArg, ["status", "--porcelain"]);
|
|
149
|
+
if (status.exitCode !== 0 || status.stdout.trim() !== "") {
|
|
150
|
+
report.problems.push({
|
|
151
|
+
area: "tree",
|
|
152
|
+
message: status.exitCode !== 0
|
|
153
|
+
? formatCommandFailure("Unable to inspect the working tree.", status, {
|
|
154
|
+
command: "git status",
|
|
155
|
+
timeoutMs: 60_000,
|
|
156
|
+
})
|
|
157
|
+
: "The working tree has uncommitted changes. A release packs only committed files: commit or stash them, then check again.",
|
|
158
|
+
});
|
|
159
|
+
return finish();
|
|
160
|
+
}
|
|
161
|
+
// The version source the release would bump: a project the release and its
|
|
162
|
+
// plan refuse (a Cargo.toml without projectType "rust", a Rust workspace
|
|
163
|
+
// outside the repository root, independent crate versions) is refused here
|
|
164
|
+
// with the same message, before anything is checked out.
|
|
165
|
+
try {
|
|
166
|
+
await (await openReleaseVersionSource(optionsArg.smartshell, workflow, optionsArg.cwd)).readCurrentVersion();
|
|
167
|
+
}
|
|
168
|
+
catch (error) {
|
|
169
|
+
report.problems.push({ area: "configuration", message: messageOf(error) });
|
|
170
|
+
return finish();
|
|
171
|
+
}
|
|
172
|
+
if (workflow.packageFilesConfigured) {
|
|
173
|
+
try {
|
|
174
|
+
await assertPackageJsonFilesCurrent(optionsArg.cwd);
|
|
175
|
+
}
|
|
176
|
+
catch (error) {
|
|
177
|
+
report.problems.push({ area: "configuration", message: messageOf(error) });
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
const checksNpm = workflow.targets.includes("npm");
|
|
181
|
+
const checksCargo = workflow.targets.includes("cargo");
|
|
182
|
+
if (!workflow.runBuild && !checksNpm && !checksCargo) {
|
|
183
|
+
optionsArg.log("Nothing to check: the release neither builds nor packs anything.");
|
|
184
|
+
return finish();
|
|
185
|
+
}
|
|
186
|
+
let pnpmCapability;
|
|
187
|
+
if (checksNpm) {
|
|
188
|
+
try {
|
|
189
|
+
pnpmCapability = await assertPnpmReleaseCapability(optionsArg.smartshell, optionsArg.cwd);
|
|
190
|
+
}
|
|
191
|
+
catch (error) {
|
|
192
|
+
report.problems.push({ area: "npm", message: messageOf(error) });
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
if (workflow.runBuild)
|
|
196
|
+
report.build = { command: workflow.buildCommand, passed: false };
|
|
197
|
+
const artifactDirectory = await plugins.fs.mkdtemp(plugins.path.join(await plugins.fs.realpath(plugins.os.tmpdir()), "gitzone-release-check-"));
|
|
198
|
+
try {
|
|
199
|
+
await withIsolatedReleaseCheckout({
|
|
200
|
+
smartshell: optionsArg.smartshell,
|
|
201
|
+
repositoryCwd: optionsArg.cwd,
|
|
202
|
+
mainOid: report.sourceOid,
|
|
203
|
+
...(workflow.runBuild ? { buildCommand: workflow.buildCommand } : {}),
|
|
204
|
+
cargo: workflow.cargoVersioned,
|
|
205
|
+
}, async (checkout) => {
|
|
206
|
+
if (report.build)
|
|
207
|
+
report.build.passed = true;
|
|
208
|
+
if (checksNpm && pnpmCapability) {
|
|
209
|
+
try {
|
|
210
|
+
report.npm = {
|
|
211
|
+
packages: await checkNpmPackages(optionsArg, checkout.path, checkout.preparationPath, artifactDirectory, pnpmCapability),
|
|
212
|
+
};
|
|
213
|
+
}
|
|
214
|
+
catch (error) {
|
|
215
|
+
report.problems.push({ area: "npm", message: messageOf(error) });
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
if (checksCargo) {
|
|
219
|
+
const crateDirectory = plugins.path.join(artifactDirectory, "crates");
|
|
220
|
+
await plugins.fs.mkdir(crateDirectory);
|
|
221
|
+
try {
|
|
222
|
+
await checkCargoCrates(optionsArg, checkout.path, crateDirectory, report);
|
|
223
|
+
}
|
|
224
|
+
catch (error) {
|
|
225
|
+
report.problems.push({ area: "cargo", message: messageOf(error) });
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
});
|
|
229
|
+
}
|
|
230
|
+
catch (error) {
|
|
231
|
+
// The checkout, its install or fetch, the build, or the final exactness
|
|
232
|
+
// check failed; the packing steps above report their own failures.
|
|
233
|
+
report.problems.push({ area: "checkout", message: messageOf(error) });
|
|
234
|
+
}
|
|
235
|
+
finally {
|
|
236
|
+
await plugins.fs.rm(artifactDirectory, { recursive: true, force: true });
|
|
237
|
+
}
|
|
238
|
+
return finish();
|
|
239
|
+
};
|
|
240
|
+
/** The human-readable summary of a report, after the progress output. */
|
|
241
|
+
export const describeReleaseCheckReport = (reportArg) => {
|
|
242
|
+
const lines = [
|
|
243
|
+
"",
|
|
244
|
+
"gitzone release check",
|
|
245
|
+
`commit: ${reportArg.sourceOid ?? "none"}`,
|
|
246
|
+
`targets: ${reportArg.targets.length > 0 ? reportArg.targets.join(", ") : "none"}`,
|
|
247
|
+
`build: ${reportArg.build ? `${reportArg.build.command} (${reportArg.build.passed ? "passed" : "failed"})` : "not part of this release"}`,
|
|
248
|
+
];
|
|
249
|
+
if (reportArg.npm)
|
|
250
|
+
for (const entry of reportArg.npm.packages)
|
|
251
|
+
lines.push(`npm package: ${entry.packageName}@${entry.version} (${entry.files.length} files, ${entry.size} bytes)`);
|
|
252
|
+
if (reportArg.cargo) {
|
|
253
|
+
lines.push(`cargo order: ${reportArg.cargo.order.length > 0 ? reportArg.cargo.order.join(" -> ") : "none"} (registries ${reportArg.cargo.registries.join(", ")})`);
|
|
254
|
+
for (const crate of reportArg.cargo.crates)
|
|
255
|
+
lines.push(`crate: ${crate.name}@${crate.version} (${crate.files.length} files)`);
|
|
256
|
+
}
|
|
257
|
+
for (const entry of reportArg.notChecked)
|
|
258
|
+
lines.push(`not checked: ${entry.target}: ${entry.reason}`);
|
|
259
|
+
if (reportArg.problems.length > 0) {
|
|
260
|
+
lines.push(`problems (${reportArg.problems.length}):`);
|
|
261
|
+
for (const problem of reportArg.problems)
|
|
262
|
+
lines.push(`- [${problem.area}] ${problem.message}`);
|
|
263
|
+
}
|
|
264
|
+
lines.push(reportArg.ok
|
|
265
|
+
? "Release check passed; the checkout and every artifact were removed."
|
|
266
|
+
: `Release check failed with ${reportArg.problems.length} problem(s); the checkout and every artifact were removed.`);
|
|
267
|
+
return lines;
|
|
268
|
+
};
|
|
269
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helpers.releasecheck.js","sourceRoot":"","sources":["../../../ts/mod_release/helpers.releasecheck.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAK5C,OAAO,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAC;AAE3E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EACL,2BAA2B,EAC3B,eAAe,GAEhB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,uBAAuB,EACvB,wBAAwB,GACzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,wBAAwB,EACxB,oBAAoB,EACpB,wBAAwB,EACxB,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AA0D9D,MAAM,SAAS,GAAG,CAAC,QAAiB,EAAU,EAAE,CAC9C,QAAQ,YAAY,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAElE,MAAM,QAAQ,GAAG,KAAK,EACpB,UAAgC,EAChC,OAAiB,EACwB,EAAE,CAC3C,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE;IAC9C,GAAG,EAAE,UAAU,CAAC,GAAG;IACnB,GAAG,EAAE,aAAa;IAClB,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,MAAM;IACf,kBAAkB,EAAE,KAAK;CAC1B,CAAC,CAAC;AAEL,MAAM,iBAAiB,GAA4C;IACjE,MAAM,EACJ,6FAA6F;IAC/F,WAAW,EACT,oGAAoG;CACvG,CAAC;AAEF;;;GAGG;AACH,MAAM,gBAAgB,GAAG,KAAK,EAC5B,UAAgC,EAChC,eAAuB,EACvB,kBAA0B,EAC1B,oBAA4B,EAC5B,aAAqC,EACD,EAAE;IACtC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,MAAM,sBAAsB,CAAC,eAAe,CAAC,CAAC;IAC3E,MAAM,SAAS,GAAuB,EAAE,CAAC;IACzC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,iBAAiB,CAAC,+BAA+B,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,MAAM,qBAAqB,CACzC;YACE,UAAU,EAAE,UAAU,CAAC,UAAU;YACjC,oBAAoB,EAAE,kBAAkB;YACxC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,cAAc,EAAE,aAAa;SAC9B,EACD,eAAe,EACf,IAAI,EACJ,oBAAoB,CACrB,CAAC;QACF,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAC7B,iBAAiB,CAAC,0BAA0B,CAAC,CAAC;QAC9C,SAAS,CAAC,IAAI,CACZ,MAAM,eAAe,CACnB,UAAU,CAAC,UAAU,EACrB,eAAe,EACf,oBAAoB,EACpB,IAAI,CAAC,OAAO,EACZ,aAAa,CACd,CACF,CAAC;IACJ,CAAC;IACD,iBAAiB,CAAC,mCAAmC,CAAC,CAAC;IACvD,MAAM,wBAAwB,CAAC;QAC7B,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,iBAAiB,EAAE,oBAAoB;QACvC,SAAS;QACT,GAAG,EAAE,UAAU,CAAC,GAAG;KACpB,CAAC,CAAC;IACH,MAAM,QAAQ,GAA8B,EAAE,CAAC;IAC/C,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAC5C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,IAAI,CAAC,CACvD,CAAC;QACF,QAAQ,CAAC,IAAI,CAAC;YACZ,WAAW,EAAE,QAAQ,CAAC,WAAW;YACjC,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,KAAK,EAAE,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE;SAClC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC7B,UAAU,CAAC,GAAG,CACZ,eAAe,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,OAAO,KAAK,KAAK,CAAC,KAAK,CAAC,MAAM,WAAW,KAAK,CAAC,IAAI,kBAAkB,KAAK,CAAC,MAAM,EAAE,CAC9H,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK;YAAE,UAAU,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,gBAAgB,GAAG,KAAK,EAC5B,UAAgC,EAChC,eAAuB,EACvB,oBAA4B,EAC5B,SAA8B,EACf,EAAE;IACjB,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC;IACxC,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IAC/E,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,UAAU,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;IACpF,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;IACxE,MAAM,SAAS,GAAG,wBAAwB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACxD,KAAK,MAAM,IAAI,IAAI,SAAS;QAAE,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACnD,SAAS,CAAC,KAAK,GAAG;QAChB,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,EAAE;KACX,CAAC;IACF,KAAK,MAAM,OAAO,IAAI,wBAAwB,CAAC,IAAI,EAAE,KAAK,CAAC;QACzD,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/D,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IACpC,iBAAiB,CAAC,sBAAsB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAClC,GAAG,EAAE,eAAe;QACpB,MAAM,EAAE,oBAAoB;QAC5B,OAAO,EAAE,IAAI,CAAC,KAAK;KACpB,CAAC,CAAC;IACH,KAAK,MAAM,IAAI,IAAI,oBAAoB,CAAC,MAAM,CAAC,MAAM,CAAC;QAAE,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC7E,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;QAChF,IAAI;QACJ,OAAO;QACP,MAAM;QACN,KAAK;KACN,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,UAAgC,EACF,EAAE;IAChC,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC;IAChC,MAAM,MAAM,GAAwB;QAClC,EAAE,EAAE,KAAK;QACT,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC9C,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACzC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5C,CAAC,CAAC;QACF,QAAQ,EAAE,EAAE;KACb,CAAC;IACF,MAAM,MAAM,GAAG,GAAwB,EAAE;QACvC,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC;QACzC,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3E,IAAI,IAAI,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,oBAAoB,CAAC,+CAA+C,EAAE,IAAI,EAAE;gBACnF,OAAO,EAAE,eAAe;gBACxB,SAAS,EAAE,MAAM;aAClB,CAAC;SACH,CAAC,CAAC;QACH,OAAO,MAAM,EAAE,CAAC;IAClB,CAAC;IACD,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACtC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC;IACrE,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACzD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,MAAM;YACZ,OAAO,EACL,MAAM,CAAC,QAAQ,KAAK,CAAC;gBACnB,CAAC,CAAC,oBAAoB,CAAC,qCAAqC,EAAE,MAAM,EAAE;oBAClE,OAAO,EAAE,YAAY;oBACrB,SAAS,EAAE,MAAM;iBAClB,CAAC;gBACJ,CAAC,CAAC,yHAAyH;SAChI,CAAC,CAAC;QACH,OAAO,MAAM,EAAE,CAAC;IAClB,CAAC;IAED,2EAA2E;IAC3E,yEAAyE;IACzE,2EAA2E;IAC3E,yDAAyD;IACzD,IAAI,CAAC;QACH,MAAM,CACJ,MAAM,wBAAwB,CAAC,UAAU,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,CAChF,CAAC,kBAAkB,EAAE,CAAC;IACzB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC3E,OAAO,MAAM,EAAE,CAAC;IAClB,CAAC;IAED,IAAI,QAAQ,CAAC,sBAAsB,EAAE,CAAC;QACpC,IAAI,CAAC;YACH,MAAM,6BAA6B,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACtD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACnD,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACvD,IAAI,CAAC,QAAQ,CAAC,QAAQ,IAAI,CAAC,SAAS,IAAI,CAAC,WAAW,EAAE,CAAC;QACrD,UAAU,CAAC,GAAG,CAAC,kEAAkE,CAAC,CAAC;QACnF,OAAO,MAAM,EAAE,CAAC;IAClB,CAAC;IAED,IAAI,cAAkD,CAAC;IACvD,IAAI,SAAS,EAAE,CAAC;QACd,IAAI,CAAC;YACH,cAAc,GAAG,MAAM,2BAA2B,CAChD,UAAU,CAAC,UAAU,EACrB,UAAU,CAAC,GAAG,CACf,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAED,IAAI,QAAQ,CAAC,QAAQ;QAAE,MAAM,CAAC,KAAK,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACxF,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,OAAO,CAChD,OAAO,CAAC,IAAI,CAAC,IAAI,CACf,MAAM,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,EAC9C,wBAAwB,CACzB,CACF,CAAC;IACF,IAAI,CAAC;QACH,MAAM,2BAA2B,CAC/B;YACE,UAAU,EAAE,UAAU,CAAC,UAAU;YACjC,aAAa,EAAE,UAAU,CAAC,GAAG;YAC7B,OAAO,EAAE,MAAM,CAAC,SAAS;YACzB,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrE,KAAK,EAAE,QAAQ,CAAC,cAAc;SAC/B,EACD,KAAK,EAAE,QAAQ,EAAE,EAAE;YACjB,IAAI,MAAM,CAAC,KAAK;gBAAE,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;YAC7C,IAAI,SAAS,IAAI,cAAc,EAAE,CAAC;gBAChC,IAAI,CAAC;oBACH,MAAM,CAAC,GAAG,GAAG;wBACX,QAAQ,EAAE,MAAM,gBAAgB,CAC9B,UAAU,EACV,QAAQ,CAAC,IAAI,EACb,QAAQ,CAAC,eAAe,EACxB,iBAAiB,EACjB,cAAc,CACf;qBACF,CAAC;gBACJ,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACnE,CAAC;YACH,CAAC;YACD,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;gBACtE,MAAM,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;gBACvC,IAAI,CAAC;oBACH,MAAM,gBAAgB,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;gBAC5E,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACrE,CAAC;YACH,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,wEAAwE;QACxE,mEAAmE;QACnE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACxE,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3E,CAAC;IACD,OAAO,MAAM,EAAE,CAAC;AAClB,CAAC,CAAC;AAEF,yEAAyE;AACzE,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,SAA8B,EACpB,EAAE;IACZ,MAAM,KAAK,GAAG;QACZ,EAAE;QACF,uBAAuB;QACvB,WAAW,SAAS,CAAC,SAAS,IAAI,MAAM,EAAE;QAC1C,YAAY,SAAS,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE;QAClF,UAAU,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,0BAA0B,EAAE;KAC1I,CAAC;IACF,IAAI,SAAS,CAAC,GAAG;QACf,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,GAAG,CAAC,QAAQ;YACxC,KAAK,CAAC,IAAI,CACR,gBAAgB,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,OAAO,KAAK,KAAK,CAAC,KAAK,CAAC,MAAM,WAAW,KAAK,CAAC,IAAI,SAAS,CACxG,CAAC;IACN,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;QACpB,KAAK,CAAC,IAAI,CACR,gBAAgB,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,gBAAgB,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CACvJ,CAAC;QACF,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,KAAK,CAAC,MAAM;YACxC,KAAK,CAAC,IAAI,CAAC,UAAU,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,KAAK,KAAK,CAAC,KAAK,CAAC,MAAM,SAAS,CAAC,CAAC;IACtF,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,UAAU;QACtC,KAAK,CAAC,IAAI,CAAC,gBAAgB,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9D,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,KAAK,CAAC,IAAI,CAAC,aAAa,SAAS,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC;QACvD,KAAK,MAAM,OAAO,IAAI,SAAS,CAAC,QAAQ;YACtC,KAAK,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IACzD,CAAC;IACD,KAAK,CAAC,IAAI,CACR,SAAS,CAAC,EAAE;QACV,CAAC,CAAC,qEAAqE;QACvE,CAAC,CAAC,6BAA6B,SAAS,CAAC,QAAQ,CAAC,MAAM,4DAA4D,CACvH,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}
|
|
@@ -35,18 +35,25 @@ export interface IReleaseSourceCommit {
|
|
|
35
35
|
/** Use committed workspace discovery, or the standalone release boundary. */
|
|
36
36
|
export declare const getReleaseCommandEnvironment: (options: IReleaseSourceCommit) => Promise<NodeJS.ProcessEnv>;
|
|
37
37
|
/**
|
|
38
|
-
* The isolated release checkout installs with `pnpm install --frozen-lockfile
|
|
39
|
-
*
|
|
40
|
-
*
|
|
41
|
-
*
|
|
42
|
-
*
|
|
43
|
-
*
|
|
38
|
+
* The isolated release checkout installs with `pnpm install --frozen-lockfile`
|
|
39
|
+
* when the release commit carries a package.json, and fetches with
|
|
40
|
+
* `cargo fetch --locked` when Cargo carries the release version. A manifest or
|
|
41
|
+
* lockfile that the release commit does not carry, or a lockfile that no
|
|
42
|
+
* longer matches its manifest, would fail a release that already created its
|
|
43
|
+
* commit and tag, so preflight proves them before anything is created. The
|
|
44
|
+
* release commit is what counts, not the working folder: an ignored
|
|
45
|
+
* package.json is not part of the release.
|
|
44
46
|
*
|
|
45
47
|
* The release commit only adds the version bump, the baked commit info, and the
|
|
46
48
|
* changelog section on top of the source commit, and a version change never
|
|
47
|
-
* changes a dependency specifier, so what installs here installs there.
|
|
49
|
+
* changes a dependency specifier, so what installs here installs there. A
|
|
50
|
+
* Cargo version bump rewrites the workspace's own entries in Cargo.lock
|
|
51
|
+
* offline, which `cargo fetch --locked` accepts again in the checkout.
|
|
48
52
|
*/
|
|
49
|
-
export declare const assertReleaseCheckoutInstallable: (options: IReleaseSourceCommit
|
|
53
|
+
export declare const assertReleaseCheckoutInstallable: (options: IReleaseSourceCommit & {
|
|
54
|
+
/** projectType "rust": the Cargo workspace carries the version. */
|
|
55
|
+
cargo: boolean;
|
|
56
|
+
}) => Promise<void>;
|
|
50
57
|
export interface IIsolatedReleaseCheckout {
|
|
51
58
|
/** Disposable detached worktree that holds exactly the release commit. */
|
|
52
59
|
path: string;
|
|
@@ -68,6 +75,13 @@ export interface IIsolatedReleaseCheckoutOptions {
|
|
|
68
75
|
testCommand?: string;
|
|
69
76
|
/** Configured build command, when the checkout must build. */
|
|
70
77
|
buildCommand?: string;
|
|
78
|
+
/** projectType "rust": fetch the locked Cargo dependencies. */
|
|
79
|
+
cargo?: boolean;
|
|
80
|
+
/**
|
|
81
|
+
* Install the npm dependencies of a commit that carries a package.json;
|
|
82
|
+
* default true. A checkout that only publishes crates needs none.
|
|
83
|
+
*/
|
|
84
|
+
npmInstall?: boolean;
|
|
71
85
|
}
|
|
72
86
|
/**
|
|
73
87
|
* A release publishes what its release commit contains, so the release build
|
|
@@ -164,6 +164,7 @@ const bindPreparation = async (path, expected) => {
|
|
|
164
164
|
}
|
|
165
165
|
};
|
|
166
166
|
const releaseLockfileName = "pnpm-lock.yaml";
|
|
167
|
+
const cargoLockfileName = "Cargo.lock";
|
|
167
168
|
const commitCarriesBlob = async (options, fileArg) => {
|
|
168
169
|
const result = await options.smartshell.execSpawn("git", ["cat-file", "-t", `${options.sourceOid}:./${fileArg}`], {
|
|
169
170
|
cwd: options.cwd,
|
|
@@ -197,21 +198,51 @@ export const getReleaseCommandEnvironment = async (options) => {
|
|
|
197
198
|
PNPM_CONFIG_IGNORE_WORKSPACE: "true",
|
|
198
199
|
};
|
|
199
200
|
};
|
|
201
|
+
/** The locked Cargo dependencies of a checkout, fetched without changing Cargo.lock. */
|
|
202
|
+
const fetchLockedCargoDependencies = async (smartshellArg, cwdArg, failureArg) => {
|
|
203
|
+
const fetch = await smartshellArg.execSpawn("cargo", ["fetch", "--locked"], {
|
|
204
|
+
cwd: cwdArg,
|
|
205
|
+
silent: true,
|
|
206
|
+
timeout: 10 * 60_000,
|
|
207
|
+
timeoutKillGraceMs: 5_000,
|
|
208
|
+
});
|
|
209
|
+
if (fetch.exitCode !== 0 || fetch.timedOut)
|
|
210
|
+
throw new Error(formatCommandFailure(failureArg, fetch, {
|
|
211
|
+
command: "cargo fetch --locked",
|
|
212
|
+
timeoutMs: 10 * 60_000,
|
|
213
|
+
output: "combined",
|
|
214
|
+
}));
|
|
215
|
+
};
|
|
200
216
|
/**
|
|
201
|
-
* The isolated release checkout installs with `pnpm install --frozen-lockfile
|
|
202
|
-
*
|
|
203
|
-
*
|
|
204
|
-
*
|
|
205
|
-
*
|
|
206
|
-
*
|
|
217
|
+
* The isolated release checkout installs with `pnpm install --frozen-lockfile`
|
|
218
|
+
* when the release commit carries a package.json, and fetches with
|
|
219
|
+
* `cargo fetch --locked` when Cargo carries the release version. A manifest or
|
|
220
|
+
* lockfile that the release commit does not carry, or a lockfile that no
|
|
221
|
+
* longer matches its manifest, would fail a release that already created its
|
|
222
|
+
* commit and tag, so preflight proves them before anything is created. The
|
|
223
|
+
* release commit is what counts, not the working folder: an ignored
|
|
224
|
+
* package.json is not part of the release.
|
|
207
225
|
*
|
|
208
226
|
* The release commit only adds the version bump, the baked commit info, and the
|
|
209
227
|
* changelog section on top of the source commit, and a version change never
|
|
210
|
-
* changes a dependency specifier, so what installs here installs there.
|
|
228
|
+
* changes a dependency specifier, so what installs here installs there. A
|
|
229
|
+
* Cargo version bump rewrites the workspace's own entries in Cargo.lock
|
|
230
|
+
* offline, which `cargo fetch --locked` accepts again in the checkout.
|
|
211
231
|
*/
|
|
212
232
|
export const assertReleaseCheckoutInstallable = async (options) => {
|
|
233
|
+
if (options.cargo) {
|
|
234
|
+
for (const file of ["Cargo.toml", cargoLockfileName]) {
|
|
235
|
+
if (!(await commitCarriesBlob(options, file))) {
|
|
236
|
+
throw new Error(`The release fetches the locked Cargo dependencies of its release commit with \`cargo fetch --locked\`, but commit ${options.sourceOid} carries no root ${file}. Commit it — it must not be ignored — and release again.`);
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
logger.log("info", "Verifying the committed Cargo.lock fetches the release checkout");
|
|
240
|
+
await fetchLockedCargoDependencies(options.smartshell, options.cwd, `\`cargo fetch --locked\` rejects the committed ${cargoLockfileName}, so the release checkout could not fetch it. Run \`cargo update --workspace\`, commit the updated lockfile, and release again.`);
|
|
241
|
+
}
|
|
213
242
|
if (!(await commitCarriesBlob(options, "package.json"))) {
|
|
214
|
-
|
|
243
|
+
if (options.cargo)
|
|
244
|
+
return;
|
|
245
|
+
throw new Error(`Commit ${options.sourceOid} tracks no package.json: gitzone commit and release version the package.json, or the Cargo workspace of projectType "rust".`);
|
|
215
246
|
}
|
|
216
247
|
logger.log("info", "Verifying the committed lockfile installs the release checkout");
|
|
217
248
|
const tracked = await commitCarriesBlob(options, releaseLockfileName);
|
|
@@ -269,24 +300,40 @@ export const withIsolatedReleaseCheckout = async (options, use) => {
|
|
|
269
300
|
cwd: checkout,
|
|
270
301
|
sourceOid: options.mainOid,
|
|
271
302
|
});
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
timeout: 10 * 60_000,
|
|
282
|
-
timeoutKillGraceMs: 5_000,
|
|
303
|
+
// The checkout holds exactly the release commit, so its files are the
|
|
304
|
+
// commit's files.
|
|
305
|
+
const carriesPackageJson = await plugins.fs
|
|
306
|
+
.lstat(plugins.path.join(checkout, "package.json"))
|
|
307
|
+
.then((statArg) => statArg.isFile())
|
|
308
|
+
.catch((error) => {
|
|
309
|
+
if (error.code === "ENOENT")
|
|
310
|
+
return false;
|
|
311
|
+
throw error;
|
|
283
312
|
});
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
313
|
+
// Without a Cargo workspace the npm install always runs, so a missing or
|
|
314
|
+
// linked package.json fails it exactly as before.
|
|
315
|
+
if ((carriesPackageJson || !options.cargo) && options.npmInstall !== false) {
|
|
316
|
+
const install = await options.smartshell.execSpawn("pnpm", [
|
|
317
|
+
"install",
|
|
318
|
+
"--frozen-lockfile",
|
|
319
|
+
...(env.PNPM_CONFIG_IGNORE_WORKSPACE === "true"
|
|
320
|
+
? ["--ignore-workspace"]
|
|
321
|
+
: []),
|
|
322
|
+
], {
|
|
323
|
+
cwd: checkout,
|
|
324
|
+
env,
|
|
325
|
+
timeout: 10 * 60_000,
|
|
326
|
+
timeoutKillGraceMs: 5_000,
|
|
327
|
+
});
|
|
328
|
+
if (install.exitCode !== 0)
|
|
329
|
+
throw new Error(formatCommandFailure("Release checkout dependency installation failed.", install, {
|
|
330
|
+
command: "pnpm install --frozen-lockfile",
|
|
331
|
+
timeoutMs: 10 * 60_000,
|
|
332
|
+
output: "combined",
|
|
333
|
+
}));
|
|
334
|
+
}
|
|
335
|
+
if (options.cargo)
|
|
336
|
+
await fetchLockedCargoDependencies(options.smartshell, checkout, "Release checkout Cargo dependency fetch failed.");
|
|
290
337
|
if (options.testCommand)
|
|
291
338
|
await run(options.smartshell, checkout, options.testCommand, "tests", env);
|
|
292
339
|
if (options.buildCommand)
|
|
@@ -338,6 +385,7 @@ export const withReleasePreparationRecovery = async (options, ensureState, prepa
|
|
|
338
385
|
...(options.workflow.runBuild
|
|
339
386
|
? { buildCommand: options.workflow.buildCommand }
|
|
340
387
|
: {}),
|
|
388
|
+
cargo: options.workflow.cargoVersioned,
|
|
341
389
|
}, async (checkout) => {
|
|
342
390
|
await ensureState();
|
|
343
391
|
return prepare(checkout);
|
|
@@ -352,4 +400,4 @@ const run = async (smartshell, cwd, command, phase, env) => {
|
|
|
352
400
|
throw new Error(formatCommandFailure(`Release ${phase} failed in the release checkout.`, result, { command, output: "combined" }));
|
|
353
401
|
logger.log("success", `Release ${phase} passed in the release checkout in ${formatReleaseDuration(Date.now() - startedAt)}.`);
|
|
354
402
|
};
|
|
355
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helpers.releasepreparation.js","sourceRoot":"","sources":["../../../ts/mod_release/helpers.releasepreparation.ts"],"names":[],"mappings":"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"}
|
|
403
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"helpers.releasepreparation.js","sourceRoot":"","sources":["../../../ts/mod_release/helpers.releasepreparation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as plugins from "./mod.plugins.js";
|
|
2
|
-
import { ReleaseJournalStore, type TReleaseJournal } from "./classes.releasejournal.js";
|
|
2
|
+
import { ReleaseJournalStore, type IReleaseCrateArtifact, type TReleaseJournal } from "./classes.releasejournal.js";
|
|
3
3
|
import { GiteaAssetsClient, type IGiteaAssetTransferLimits } from "./helpers.giteaassets.js";
|
|
4
|
+
import { type IRsrepoEngineClient } from "./helpers.rsrepoengine.js";
|
|
4
5
|
import { type IPnpmReleaseCapability, type INpmArtifactProbeOptions } from "./helpers.npmartifact.js";
|
|
5
6
|
import { type IReleaseGitRemotePolicy } from "./helpers.gitremote.js";
|
|
6
7
|
import { type ITsdockerReleaseClient } from "./helpers.tsdockerprotocol.js";
|
|
@@ -34,6 +35,17 @@ export interface IReleasePublicationOptions {
|
|
|
34
35
|
giteaAssetConcurrency?: number;
|
|
35
36
|
/** Bound and retries of the Git target's remote commands. */
|
|
36
37
|
gitRemotePolicy?: IReleaseGitRemotePolicy;
|
|
38
|
+
/** The rsrepo engine that publishes and probes the journal's crates. */
|
|
39
|
+
cargoEngine?: IRsrepoEngineClient;
|
|
40
|
+
/** Waiting budget for one accepted crate before resume takes over. */
|
|
41
|
+
cargoVerificationWindowMs?: number;
|
|
42
|
+
/** Replaces the probe schedule derived from the window; tests only shorten it. */
|
|
43
|
+
cargoProbeSchedule?: ICargoProbeSchedule;
|
|
44
|
+
/**
|
|
45
|
+
* Opens a checkout of the release commit for `cargo publish`, runs the
|
|
46
|
+
* publication in it and removes it again.
|
|
47
|
+
*/
|
|
48
|
+
withCargoPublishCheckout?: <T>(useArg: (checkoutCwdArg: string) => Promise<T>) => Promise<T>;
|
|
37
49
|
giteaAssets?: Pick<GiteaAssetsClient, "preflight" | "inspectRelease" | "createRelease" | "inspectAssets" | "uploadAsset" | "verifyComplete" | "publishRelease">;
|
|
38
50
|
ensurePublicationState: (expectedRemoteMainOidArg?: string) => Promise<void>;
|
|
39
51
|
}
|
|
@@ -44,4 +56,12 @@ export interface IReleasePublicationOptions {
|
|
|
44
56
|
* its result inconclusive. Every failure is reported.
|
|
45
57
|
*/
|
|
46
58
|
export declare const runBoundedInOrder: <T>(itemsArg: readonly T[], concurrencyArg: number, workArg: (itemArg: T) => Promise<void>, describeArg: (itemArg: T) => string) => Promise<void>;
|
|
59
|
+
/** The probes one waiting verification of an accepted crate makes. */
|
|
60
|
+
export interface ICargoProbeSchedule {
|
|
61
|
+
attempts: number;
|
|
62
|
+
delayMs: number;
|
|
63
|
+
maxDelayMs: number;
|
|
64
|
+
}
|
|
65
|
+
/** Stored crate bytes must still be the packed ones before anything is published. */
|
|
66
|
+
export declare const verifyStoredCrateArtifact: (artifactPathArg: string, crateArg: IReleaseCrateArtifact) => Promise<void>;
|
|
47
67
|
export declare const executeReleasePublication: (optionsArg: IReleasePublicationOptions) => Promise<TReleaseJournal>;
|