@intentius/chant 0.124.69 → 0.124.71
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/ci-agent.d.ts +12 -1
- package/dist/ci-agent.d.ts.map +1 -1
- package/dist/ci-agent.js +13 -8
- package/dist/ci-commit.d.ts +297 -0
- package/dist/ci-commit.d.ts.map +1 -0
- package/dist/ci-commit.js +696 -0
- package/dist/ci-product-words.d.ts +6 -1
- package/dist/ci-product-words.d.ts.map +1 -1
- package/dist/ci-product-words.js +3 -1
- package/dist/cli/handlers/approve.d.ts.map +1 -1
- package/dist/cli/handlers/approve.js +7 -2
- package/dist/cli/handlers/commit.d.ts +26 -0
- package/dist/cli/handlers/commit.d.ts.map +1 -0
- package/dist/cli/handlers/commit.js +142 -0
- package/dist/cli/handlers/pr.d.ts +6 -0
- package/dist/cli/handlers/pr.d.ts.map +1 -1
- package/dist/cli/handlers/pr.js +16 -7
- package/dist/cli/handlers/release.d.ts +9 -0
- package/dist/cli/handlers/release.d.ts.map +1 -1
- package/dist/cli/handlers/release.js +114 -5
- package/dist/cli/main.d.ts.map +1 -1
- package/dist/cli/main.js +23 -0
- package/dist/cli/parse-args.d.ts.map +1 -1
- package/dist/cli/parse-args.js +15 -0
- package/dist/cli/registry.d.ts +4 -0
- package/dist/cli/registry.d.ts.map +1 -1
- package/dist/components/product-pipeline.d.ts +33 -0
- package/dist/components/product-pipeline.d.ts.map +1 -1
- package/dist/components/product-pipeline.js +34 -1
- package/dist/components/release-compile.d.ts +2 -0
- package/dist/components/release-compile.d.ts.map +1 -1
- package/dist/components/release-compile.js +8 -4
- package/dist/config.d.ts +46 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +9 -0
- package/dist/lexicon.d.ts +37 -0
- package/dist/lexicon.d.ts.map +1 -1
- package/dist/lexicon.js +28 -0
- package/dist/lifecycle/__fixtures__/publish-fakes.d.ts +4 -0
- package/dist/lifecycle/__fixtures__/publish-fakes.d.ts.map +1 -1
- package/dist/lifecycle/__fixtures__/publish-fakes.js +6 -2
- package/dist/lifecycle/gated-request.d.ts +3 -1
- package/dist/lifecycle/gated-request.d.ts.map +1 -1
- package/dist/lifecycle/gated-request.js +5 -2
- package/dist/lifecycle/git.d.ts.map +1 -1
- package/dist/lifecycle/git.js +57 -0
- package/dist/lifecycle/publish-declaration.d.ts +16 -0
- package/dist/lifecycle/publish-declaration.d.ts.map +1 -1
- package/dist/lifecycle/publish-declaration.js +35 -3
- package/dist/lifecycle/publish-forge.d.ts +12 -0
- package/dist/lifecycle/publish-forge.d.ts.map +1 -1
- package/dist/lifecycle/publish-forge.js +103 -19
- package/dist/lifecycle/publish-npm.d.ts +15 -0
- package/dist/lifecycle/publish-npm.d.ts.map +1 -1
- package/dist/lifecycle/publish-npm.js +28 -1
- package/dist/lifecycle/publish-oci.d.ts +2 -0
- package/dist/lifecycle/publish-oci.d.ts.map +1 -1
- package/dist/lifecycle/publish-oci.js +10 -0
- package/dist/lifecycle/release-cut.d.ts +7 -1
- package/dist/lifecycle/release-cut.d.ts.map +1 -1
- package/dist/lifecycle/release-cut.js +8 -1
- package/dist/lifecycle/release-images.d.ts +87 -0
- package/dist/lifecycle/release-images.d.ts.map +1 -0
- package/dist/lifecycle/release-images.js +139 -0
- package/dist/lifecycle/release-publish.d.ts +2 -0
- package/dist/lifecycle/release-publish.d.ts.map +1 -1
- package/dist/op/activities/activity-contracts.d.ts +4 -4
- package/dist/op/activities/review-agent.d.ts.map +1 -1
- package/dist/op/activities/review-agent.js +4 -2
- package/dist/op/gate.d.ts +5 -1
- package/dist/op/gate.d.ts.map +1 -1
- package/dist/op/gate.js +7 -2
- package/dist/op/op-waves-notify.d.ts +1 -1
- package/dist/op/op-waves-notify.d.ts.map +1 -1
- package/dist/op/op-waves-notify.js +2 -1
- package/dist/op/op-waves-run.d.ts.map +1 -1
- package/dist/op/op-waves-run.js +12 -8
- package/dist/op/op-waves.d.ts +9 -0
- package/dist/op/op-waves.d.ts.map +1 -1
- package/dist/op/op-waves.js +11 -0
- package/dist/pr-forge-base.d.ts +18 -0
- package/dist/pr-forge-base.d.ts.map +1 -0
- package/dist/pr-forge-base.js +29 -0
- package/dist/release-floors.d.ts +1 -1
- package/dist/release-floors.js +1 -1
- package/dist/wave-runtime.mjs +305 -305
- package/dist/workspace/ci-green-cli.d.ts +7 -3
- package/dist/workspace/ci-green-cli.d.ts.map +1 -1
- package/dist/workspace/ci-green-cli.js +29 -8
- package/dist/workspace/ci-green-forge.d.ts +29 -0
- package/dist/workspace/ci-green-forge.d.ts.map +1 -1
- package/dist/workspace/ci-green-forge.js +50 -0
- package/dist/workspace/ci-green-workflow.d.ts +9 -1
- package/dist/workspace/ci-green-workflow.d.ts.map +1 -1
- package/dist/workspace/ci-green-workflow.js +15 -3
- package/dist/workspace/ci-green.d.ts +35 -1
- package/dist/workspace/ci-green.d.ts.map +1 -1
- package/dist/workspace/ci-green.js +122 -4
- package/dist/workspace/declaration.d.ts +14 -2
- package/dist/workspace/declaration.d.ts.map +1 -1
- package/dist/workspace/declaration.js +14 -1
- package/dist/workspace/declaration.schema.json +17 -2
- package/dist/workspace/release-workflow.d.ts +23 -0
- package/dist/workspace/release-workflow.d.ts.map +1 -1
- package/dist/workspace/release-workflow.js +203 -12
- package/package.json +1 -1
- package/src/ci-agent.ts +13 -8
- package/src/ci-commit.test.ts +415 -0
- package/src/ci-commit.ts +857 -0
- package/src/ci-product-words.ts +6 -2
- package/src/cli/handlers/approve.ts +6 -2
- package/src/cli/handlers/commit.ts +152 -0
- package/src/cli/handlers/operator.test.ts +2 -0
- package/src/cli/handlers/pr-wave-approve-lines.test.ts +32 -0
- package/src/cli/handlers/pr.ts +17 -7
- package/src/cli/handlers/release.ts +110 -5
- package/src/cli/main.ts +23 -0
- package/src/cli/parse-args.ts +11 -0
- package/src/cli/registry.ts +4 -0
- package/src/components/product-pipeline.test.ts +28 -1
- package/src/components/product-pipeline.ts +54 -1
- package/src/components/release-compile.ts +9 -3
- package/src/config.ts +24 -0
- package/src/lexicon.ts +56 -0
- package/src/lifecycle/__fixtures__/publish-fakes.ts +11 -5
- package/src/lifecycle/gated-request-spend.test.ts +115 -0
- package/src/lifecycle/gated-request.ts +5 -2
- package/src/lifecycle/git.ts +53 -0
- package/src/lifecycle/ledger-two-clones.test.ts +132 -0
- package/src/lifecycle/publish-declaration.ts +35 -3
- package/src/lifecycle/publish-forge-notes.test.ts +193 -0
- package/src/lifecycle/publish-forge.ts +101 -22
- package/src/lifecycle/publish-npm.ts +31 -2
- package/src/lifecycle/publish-oci.ts +10 -0
- package/src/lifecycle/publish-targets.test.ts +2 -1
- package/src/lifecycle/release-cut.ts +17 -1
- package/src/lifecycle/release-images.test.ts +242 -0
- package/src/lifecycle/release-images.ts +175 -0
- package/src/lifecycle/release-publish.ts +2 -0
- package/src/op/activities/review-agent.test.ts +20 -1
- package/src/op/activities/review-agent.ts +5 -2
- package/src/op/gate.ts +7 -2
- package/src/op/op-waves-approve-target.test.ts +108 -0
- package/src/op/op-waves-notify.ts +2 -2
- package/src/op/op-waves-run.ts +12 -7
- package/src/op/op-waves.ts +12 -0
- package/src/pr-forge-base.test.ts +37 -0
- package/src/pr-forge-base.ts +36 -0
- package/src/release-floors.ts +1 -1
- package/src/workspace/__fixtures__/release-workflow/forgejo-plain-member.yml +26 -0
- package/src/workspace/__fixtures__/release-workflow/forgejo-plain.yml +23 -0
- package/src/workspace/__fixtures__/release-workflow/forgejo-secure-member.yml +27 -0
- package/src/workspace/__fixtures__/release-workflow/forgejo-secure.yml +24 -0
- package/src/workspace/__fixtures__/release-workflow/github-plain-member.yml +26 -0
- package/src/workspace/__fixtures__/release-workflow/github-plain.yml +23 -0
- package/src/workspace/__fixtures__/release-workflow/github-secure-member.yml +27 -0
- package/src/workspace/__fixtures__/release-workflow/github-secure.yml +24 -0
- package/src/workspace/__fixtures__/release-workflow/gitlab-plain-member.yml +13 -0
- package/src/workspace/__fixtures__/release-workflow/gitlab-plain.yml +12 -0
- package/src/workspace/__fixtures__/release-workflow/gitlab-secure-member.yml +14 -0
- package/src/workspace/__fixtures__/release-workflow/gitlab-secure.yml +13 -0
- package/src/workspace/ci-green-cli.ts +27 -8
- package/src/workspace/ci-green-forge.ts +70 -0
- package/src/workspace/ci-green-workflow.ts +15 -3
- package/src/workspace/ci-green.ts +130 -5
- package/src/workspace/ci-verdict-retries.test.ts +376 -0
- package/src/workspace/declaration.schema.json +17 -2
- package/src/workspace/declaration.ts +28 -4
- package/src/workspace/release-workflow.test.ts +151 -0
- package/src/workspace/release-workflow.ts +270 -12
|
@@ -31,7 +31,7 @@ export declare const CI_PRODUCT_STAGES: readonly CiProductStage[];
|
|
|
31
31
|
* answers it. `action` (#4653) asks for a day-2 action on one member, which
|
|
32
32
|
* runs under a gated request.
|
|
33
33
|
*/
|
|
34
|
-
export type CiProductCommand = "plan" | "apply" | "lock" | "unlock" | "agent" | "action";
|
|
34
|
+
export type CiProductCommand = "plan" | "apply" | "lock" | "unlock" | "agent" | "action" | "commit";
|
|
35
35
|
export declare const CI_PRODUCT_COMMANDS: readonly CiProductCommand[];
|
|
36
36
|
/**
|
|
37
37
|
* What an approval of a product's waves binds to (ruling B, 2026-10-27).
|
|
@@ -290,6 +290,11 @@ export type ParsedProductComment =
|
|
|
290
290
|
kind: "action";
|
|
291
291
|
member: string;
|
|
292
292
|
address: string;
|
|
293
|
+
}
|
|
294
|
+
/** A commit job's command (#4722), by the word typed: `/terragucci fmt`. Several words may each map onto `commit`. */
|
|
295
|
+
| {
|
|
296
|
+
kind: "commit";
|
|
297
|
+
word: string;
|
|
293
298
|
} | {
|
|
294
299
|
kind: "refused";
|
|
295
300
|
reason: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ci-product-words.d.ts","sourceRoot":"","sources":["../src/ci-product-words.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,iGAAiG;AACjG,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,SAAS,CAAC;AAE/G,8EAA8E;AAC9E,eAAO,MAAM,iBAAiB,EAAE,SAAS,cAAc,EAAiF,CAAC;AAEzI;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"ci-product-words.d.ts","sourceRoot":"","sources":["../src/ci-product-words.ts"],"names":[],"mappings":"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"}
|
package/dist/ci-product-words.js
CHANGED
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
*/
|
|
25
25
|
/** Every stage slot, in the order {@link assertProductWords} reports them. */
|
|
26
26
|
export const CI_PRODUCT_STAGES = ["plan", "apply", "record", "check", "drift", "lock", "approval", "control"];
|
|
27
|
-
export const CI_PRODUCT_COMMANDS = ["plan", "apply", "lock", "unlock", "agent", "action"];
|
|
27
|
+
export const CI_PRODUCT_COMMANDS = ["plan", "apply", "lock", "unlock", "agent", "action", "commit"];
|
|
28
28
|
export const CI_PRODUCT_APPLY_MODES = ["on-merge", "release", "before-merge"];
|
|
29
29
|
/** chant's own wave label in a notify summary. */
|
|
30
30
|
export const CHANT_NOTIFY_WAVE_TEMPLATE = "wave {k} ({name}) of {spec}";
|
|
@@ -356,6 +356,8 @@ export function parseProductComment(words, body, env = {}) {
|
|
|
356
356
|
case "lock":
|
|
357
357
|
case "unlock":
|
|
358
358
|
return parts.length === 2 ? { kind: command } : { kind: "refused", reason: `${line} takes nothing after it` };
|
|
359
|
+
case "commit":
|
|
360
|
+
return parts.length === 2 ? { kind: "commit", word: typed } : { kind: "refused", reason: `${line} takes nothing after it` };
|
|
359
361
|
case "agent": {
|
|
360
362
|
const ask = text.slice(`${prefix} ${typed}`.length).trim();
|
|
361
363
|
if (ask === "")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approve.d.ts","sourceRoot":"","sources":["../../../src/cli/handlers/approve.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAC3F,OAAO,EACuE,KAAK,UAAU,EAC5F,MAAM,6BAA6B,CAAC;AAOrC,OAAO,EAEuC,KAAK,mBAAmB,EAAE,KAAK,oBAAoB,EAChG,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAiE,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAO3H,OAAO,EAA4D,KAAK,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAM9H,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"approve.d.ts","sourceRoot":"","sources":["../../../src/cli/handlers/approve.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAC3F,OAAO,EACuE,KAAK,UAAU,EAC5F,MAAM,6BAA6B,CAAC;AAOrC,OAAO,EAEuC,KAAK,mBAAmB,EAAE,KAAK,oBAAoB,EAChG,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAiE,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAO3H,OAAO,EAA4D,KAAK,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAM9H,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAsDlD,wBAAsB,UAAU,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAoKrE;AAED,8DAA8D;AAC9D,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB;;;;;;;OAOG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,sEAAsE;IACtE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,kCAAkC;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wEAAwE;IACxE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oDAAoD;IACpD,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,6GAA6G;IAC7G,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oGAAoG;IACpG,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,8EAA8E;IAC9E,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC;AAED,MAAM,MAAM,mBAAmB,GAC3B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,oBAAoB,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,GAC3D;IAAE,EAAE,EAAE,KAAK,CAAA;CAAE,CAAC;AA0ClB;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,mBAAmB,GACxB,OAAO,CAAC,mBAAmB,CAAC,CAG9B;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAGlI;AAogBD;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,oBAAoB,EAC9B,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,oBAAoB,EAAE,EAC7B,QAAQ,EAAE,iBAAiB,GAAG,SAAS,EACvC,OAAO,GAAE,SAAS,iBAAiB,EAA+B,EAClE,KAAK,GAAE,eAAgC,GACtC,MAAM,EAAE,CAuCV"}
|
|
@@ -14,7 +14,7 @@ import { approverOf, humanQuorumSince, tallyGateApprovals } from "../../op/gate.
|
|
|
14
14
|
import { quorumRuleLine, quorumRules, trustQuorumJudge, UNPROVEN_JUDGE } from "../../op/gate-quorum.js";
|
|
15
15
|
import { FAN_OUT_GATE_OP, OVERRIDE_GATE_OP, RELEASE_GATE_OP, WORKSPACE_EXIT_GATE_OP, WORKSPACE_PROMOTE_GATE_OP, WORKSPACE_UPGRADE_GATE_OP } from "../../op/gate-name.js";
|
|
16
16
|
import { PR_GATE_OP } from "../../pr-loop.js";
|
|
17
|
-
import {
|
|
17
|
+
import { LifecyclePushLostError, pushLifecycleRebasing, requireLifecycleLedger } from "../../lifecycle/git.js";
|
|
18
18
|
import { LIFECYCLE_LOCAL_NOTE, isLifecycleLocalNote } from "../../lifecycle/local-note.js";
|
|
19
19
|
import { ledgerRecordingOff, NO_RECORD_ENV } from "../../lifecycle/no-record.js";
|
|
20
20
|
import { checkGateSignature, gateSealPayload, gateSealVersion, WEBAUTHN_SEAL_KIND } from "../../lifecycle/gate-seal.js";
|
|
@@ -58,7 +58,12 @@ const LIFECYCLE_BRANCH = "chant/lifecycle";
|
|
|
58
58
|
* elsewhere to tell, so that case is a quiet suffix and no warning (#3677).
|
|
59
59
|
*/
|
|
60
60
|
async function reportedPush(consequence) {
|
|
61
|
-
|
|
61
|
+
// #4637: a push another writer beat is replayed onto the remote's tip and tried again; an approval line appends.
|
|
62
|
+
const { pushed, pushWarning } = await pushLifecycleRebasing().catch((err) => {
|
|
63
|
+
if (err instanceof LifecyclePushLostError)
|
|
64
|
+
return { pushed: false, pushWarning: err.message };
|
|
65
|
+
throw err;
|
|
66
|
+
});
|
|
62
67
|
if (pushed)
|
|
63
68
|
return { pushed, suffix: "" };
|
|
64
69
|
if (isLifecycleLocalNote(pushWarning))
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `chant commit prepare|run|land` (#4722): the three steps of the commit jobs
|
|
3
|
+
* the Op generator writes for a scheduled Op spec's `commit`
|
|
4
|
+
* (../../ci-commit.ts says what each does and which token each holds).
|
|
5
|
+
*
|
|
6
|
+
* ```
|
|
7
|
+
* chant commit prepare --forge <kind> [--output <dir>] the commit job, read token: decide
|
|
8
|
+
* chant commit run --forge <kind> [--output <dir>] the commit job, no forge token: run the command
|
|
9
|
+
* chant commit land --forge <kind> [--output <dir>] the push job, push token: commit, push, reply, record
|
|
10
|
+
* ```
|
|
11
|
+
*
|
|
12
|
+
* The settings come from the job's `CHANT_COMMIT_*` variables, which the
|
|
13
|
+
* generator wrote into the workflow file of the base branch.
|
|
14
|
+
*/
|
|
15
|
+
import { type HeadApproval } from "../../ci-commit.js";
|
|
16
|
+
import { type CiProductWords } from "../../ci-product-words.js";
|
|
17
|
+
import { type LedgerLocation } from "../../lifecycle/git.js";
|
|
18
|
+
import type { CommandContext } from "../registry.js";
|
|
19
|
+
/**
|
|
20
|
+
* Who approved the plan of pull request `pr` at `sha`, read from the gate
|
|
21
|
+
* ledger: a resolution of the pull request's gates (`pr-<n>`, `pr-<n>-<member>`)
|
|
22
|
+
* or the waves' op, made for that commit. Undefined when there is none.
|
|
23
|
+
*/
|
|
24
|
+
export declare function ledgerHeadApproval(words: CiProductWords, location?: LedgerLocation): HeadApproval;
|
|
25
|
+
export declare function runCommitCommandLine(ctx: CommandContext): Promise<number>;
|
|
26
|
+
//# sourceMappingURL=commit.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"commit.d.ts","sourceRoot":"","sources":["../../../src/cli/handlers/commit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAOH,OAAO,EAOL,KAAK,YAAY,EAClB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGjF,OAAO,EAA2D,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAMnH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAkClD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,cAAc,GAAG,YAAY,CAYjG;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CA4D/E"}
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `chant commit prepare|run|land` (#4722): the three steps of the commit jobs
|
|
3
|
+
* the Op generator writes for a scheduled Op spec's `commit`
|
|
4
|
+
* (../../ci-commit.ts says what each does and which token each holds).
|
|
5
|
+
*
|
|
6
|
+
* ```
|
|
7
|
+
* chant commit prepare --forge <kind> [--output <dir>] the commit job, read token: decide
|
|
8
|
+
* chant commit run --forge <kind> [--output <dir>] the commit job, no forge token: run the command
|
|
9
|
+
* chant commit land --forge <kind> [--output <dir>] the push job, push token: commit, push, reply, record
|
|
10
|
+
* ```
|
|
11
|
+
*
|
|
12
|
+
* The settings come from the job's `CHANT_COMMIT_*` variables, which the
|
|
13
|
+
* generator wrote into the workflow file of the base branch.
|
|
14
|
+
*/
|
|
15
|
+
import { execFileSync } from "node:child_process";
|
|
16
|
+
import { readFileSync } from "node:fs";
|
|
17
|
+
import { tmpdir } from "node:os";
|
|
18
|
+
import { join, resolve } from "node:path";
|
|
19
|
+
import { AgentError } from "../../ci-agent.js";
|
|
20
|
+
import { COMMIT_DIR, commitSettingsFromEnv, landCommitChange, prepareCommitRun, runCommit, runCommitArgv, } from "../../ci-commit.js";
|
|
21
|
+
import { activeProductWords } from "../../ci-product-words.js";
|
|
22
|
+
import { CHANT_EXIT } from "../../exit-codes.js";
|
|
23
|
+
import { appendRunRecord, readRunLedger } from "../../lifecycle/run-ledger.js";
|
|
24
|
+
import { listFilesInDir, pushLifecycleRebasing, readBlobFromPath } from "../../lifecycle/git.js";
|
|
25
|
+
import { parseGateLedger } from "../../lifecycle/gate-ledger.js";
|
|
26
|
+
import { resolveCiRun } from "../../lifecycle/release-ledger.js";
|
|
27
|
+
import { FORGE_KINDS, forgeFromEnv } from "../../pr-forge.js";
|
|
28
|
+
import { pullRequestBaseFromEnv } from "../../pr-forge-base.js";
|
|
29
|
+
import { formatError, formatInfo } from "../format.js";
|
|
30
|
+
const USAGE = "chant commit prepare|run|land --forge github|gitlab|forgejo [--output <dir>]";
|
|
31
|
+
function fail(message) {
|
|
32
|
+
console.error(formatError({ message, hint: USAGE }));
|
|
33
|
+
return CHANT_EXIT.failed;
|
|
34
|
+
}
|
|
35
|
+
/** git with hooks and fsmonitor off: nothing here runs code from the repository. */
|
|
36
|
+
const git = (args, opts = {}) => execFileSync("git", ["-c", "core.hooksPath=/dev/null", "-c", "core.fsmonitor=false", ...args], {
|
|
37
|
+
cwd: opts.cwd,
|
|
38
|
+
input: opts.input,
|
|
39
|
+
encoding: "utf8",
|
|
40
|
+
stdio: ["pipe", "pipe", "pipe"],
|
|
41
|
+
env: { ...process.env, GIT_TERMINAL_PROMPT: "0" },
|
|
42
|
+
maxBuffer: 64 << 20,
|
|
43
|
+
});
|
|
44
|
+
function eventOf() {
|
|
45
|
+
const file = process.env.GITHUB_EVENT_PATH;
|
|
46
|
+
if (!file)
|
|
47
|
+
return undefined;
|
|
48
|
+
try {
|
|
49
|
+
return JSON.parse(readFileSync(file, "utf8"));
|
|
50
|
+
}
|
|
51
|
+
catch {
|
|
52
|
+
return undefined;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
function workDir(name) {
|
|
56
|
+
return join(process.env.RUNNER_TEMP || process.env.TMPDIR || tmpdir(), name);
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* Who approved the plan of pull request `pr` at `sha`, read from the gate
|
|
60
|
+
* ledger: a resolution of the pull request's gates (`pr-<n>`, `pr-<n>-<member>`)
|
|
61
|
+
* or the waves' op, made for that commit. Undefined when there is none.
|
|
62
|
+
*/
|
|
63
|
+
export function ledgerHeadApproval(words, location) {
|
|
64
|
+
return async (pr, sha) => {
|
|
65
|
+
const own = new RegExp(`^pr-${pr}(-[a-z0-9][a-z0-9-]*)?\\.jsonl$`);
|
|
66
|
+
const files = (await listFilesInDir("_gates", location)).filter((f) => own.test(f) || (words.op !== undefined && f === `${words.op}.jsonl`));
|
|
67
|
+
for (const f of files) {
|
|
68
|
+
const text = await readBlobFromPath("_gates", f, location);
|
|
69
|
+
if (!text)
|
|
70
|
+
continue;
|
|
71
|
+
const hit = parseGateLedger(text).resolutions.find((r) => r.gitSha === sha);
|
|
72
|
+
if (hit)
|
|
73
|
+
return hit.resolvedBy;
|
|
74
|
+
}
|
|
75
|
+
return undefined;
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
export async function runCommitCommandLine(ctx) {
|
|
79
|
+
const action = ctx.args.path;
|
|
80
|
+
if (action !== "prepare" && action !== "run" && action !== "land")
|
|
81
|
+
return fail(action ? `commit ${action} is not one of prepare, run or land` : "commit needs an action: prepare, run or land");
|
|
82
|
+
const kind = ctx.args.forge;
|
|
83
|
+
if (!kind || !FORGE_KINDS.includes(kind))
|
|
84
|
+
return fail(`--forge is one of ${FORGE_KINDS.join(", ")}`);
|
|
85
|
+
const words = activeProductWords();
|
|
86
|
+
const dir = resolve(ctx.args.output ?? COMMIT_DIR);
|
|
87
|
+
let settings;
|
|
88
|
+
try {
|
|
89
|
+
settings = commitSettingsFromEnv(process.env, words.product);
|
|
90
|
+
}
|
|
91
|
+
catch (e) {
|
|
92
|
+
return fail(e.message);
|
|
93
|
+
}
|
|
94
|
+
const readRuns = async () => (await readRunLedger(settings.env, settings.name)).records;
|
|
95
|
+
const forge = () => forgeFromEnv(kind);
|
|
96
|
+
const approval = ledgerHeadApproval(words);
|
|
97
|
+
try {
|
|
98
|
+
if (action === "prepare") {
|
|
99
|
+
const base = kind !== "gitlab" ? pullRequestBaseFromEnv(kind) : undefined;
|
|
100
|
+
const d = await prepareCommitRun({ settings, words, dir, env: process.env, event: eventOf(), ...(kind !== "gitlab" ? { forge: forge() } : {}), ...(base ? { pullRequestBase: base } : {}), readRuns, approval, git, now: new Date() });
|
|
101
|
+
console.error(formatInfo(d.go ? `${settings.name}: runs on ${d.sha?.slice(0, 12)} for #${d.pr}` : `${settings.name}: does not run: ${d.reason}`));
|
|
102
|
+
return CHANT_EXIT.done;
|
|
103
|
+
}
|
|
104
|
+
if (action === "run") {
|
|
105
|
+
const r = await runCommit({ settings, dir, checkout: process.cwd(), workDir: workDir("chant-commit-work"), env: process.env, git, runCommand: runCommitArgv });
|
|
106
|
+
console.error(formatInfo(`${settings.name}: exited ${r.rc}${r.changed ? ", with a change" : ", changing nothing"}`));
|
|
107
|
+
// The push job says why on the pull request; this job stays green so it runs.
|
|
108
|
+
return CHANT_EXIT.done;
|
|
109
|
+
}
|
|
110
|
+
const ci = resolveCiRun(process.env);
|
|
111
|
+
const landBase = pullRequestBaseFromEnv(kind);
|
|
112
|
+
const out = await landCommitChange({
|
|
113
|
+
...(landBase ? { pullRequestBase: landBase } : {}),
|
|
114
|
+
settings,
|
|
115
|
+
words,
|
|
116
|
+
dir,
|
|
117
|
+
workDir: workDir("chant-commit-land"),
|
|
118
|
+
env: process.env,
|
|
119
|
+
event: eventOf(),
|
|
120
|
+
forge: forge(),
|
|
121
|
+
git,
|
|
122
|
+
push: ({ cwd, ref }) => {
|
|
123
|
+
git(["push", "-q", "origin", `HEAD:${ref}`], { cwd });
|
|
124
|
+
},
|
|
125
|
+
readRuns,
|
|
126
|
+
approval,
|
|
127
|
+
record: async (input) => {
|
|
128
|
+
await appendRunRecord(input);
|
|
129
|
+
await pushLifecycleRebasing();
|
|
130
|
+
},
|
|
131
|
+
now: () => new Date(),
|
|
132
|
+
...(ci ? { runOrigin: ci.runOrigin } : {}),
|
|
133
|
+
});
|
|
134
|
+
console.error(formatInfo(`${settings.name}: ${out.result}: ${out.reason}`));
|
|
135
|
+
return out.code;
|
|
136
|
+
}
|
|
137
|
+
catch (e) {
|
|
138
|
+
if (e instanceof AgentError)
|
|
139
|
+
return fail(e.message);
|
|
140
|
+
return fail(`commit ${action}: ${e.message}`);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
@@ -174,6 +174,12 @@ export declare function runComponentsPrPlan(ctx: CommandContext): Promise<number
|
|
|
174
174
|
export declare function runComponentsPrApply(ctx: CommandContext): Promise<number>;
|
|
175
175
|
/** chant components pr-record --base <ref> [--pr <n>] [--env <env>] [--gate <name>] [--forge <kind>] [--output <dir>] [--json] [--events-json] [--report-url <url>] */
|
|
176
176
|
export declare function runComponentsPrRecord(ctx: CommandContext): Promise<number>;
|
|
177
|
+
/** A waiting wave's or round's approve lines (#4574): one per component when the product's template names `{target}`, as the note names them (#4601). */
|
|
178
|
+
export declare function waveApproveLines(op: string, env: string, w: {
|
|
179
|
+
gate: string;
|
|
180
|
+
digest: string;
|
|
181
|
+
components: readonly string[];
|
|
182
|
+
}): string;
|
|
177
183
|
/**
|
|
178
184
|
* `chant components plan-wave --runs <file> --plans <file> --base <ref>
|
|
179
185
|
* --env <env> [--member <m>] [--wave-outputs <file>]` (#4588): the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pr.d.ts","sourceRoot":"","sources":["../../../src/cli/handlers/pr.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pr.d.ts","sourceRoot":"","sources":["../../../src/cli/handlers/pr.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/handlers/pr.js
CHANGED
|
@@ -1274,7 +1274,7 @@ async function prApply(ctx, stage, beforeMerge) {
|
|
|
1274
1274
|
members: applied.members,
|
|
1275
1275
|
...(resumed ? { resumed: resumed.completed } : {}),
|
|
1276
1276
|
...(applied.rounds ? { rounds: applied.rounds } : {}),
|
|
1277
|
-
...(applied.held ? { message: applied.held } : applied.leaseFailed ? { message: applied.leaseFailed } : applied.status === "waiting" ? { message: waitingMessage(op, applied.rounds) } : {}),
|
|
1277
|
+
...(applied.held ? { message: applied.held } : applied.leaseFailed ? { message: applied.leaseFailed } : applied.status === "waiting" ? { message: waitingMessage(op, p.env, applied.rounds) } : {}),
|
|
1278
1278
|
});
|
|
1279
1279
|
// A component that stopped at a gate of its own leaves the apply waiting on
|
|
1280
1280
|
// a person. A step that refused its plan because the target moved since
|
|
@@ -1675,11 +1675,13 @@ async function decideApplyGate(p, at) {
|
|
|
1675
1675
|
console.error(formatInfo(`the merged changes' approvals do not cover the plan at ${green.commit.slice(0, 12)}: ${uncovered.join("; ")}`));
|
|
1676
1676
|
}
|
|
1677
1677
|
const digest = set.doc.digest;
|
|
1678
|
+
// #4574: the members fill a product's {target}, one line each, as the note names them (#4601).
|
|
1679
|
+
const approve = prApproveCommands({ op, gate: p.gate, digest, env: p.env, ...(p.member ? { member: p.member } : {}), members: set.members }).join("; ");
|
|
1678
1680
|
const check = await emitGateStep(events?.emit, { op, gate: p.gate }, () => decidePrGate(gitGateLedgerPort(), { op, gate: p.gate, digest, description: `${changeLabel(pr, green)}: ${p.plan.order.join(", ")}` }), (unapproved) => {
|
|
1679
1681
|
const a = approvalOf(unapproved);
|
|
1680
1682
|
return a.status === "changed"
|
|
1681
1683
|
? describePlanChanged({ op, gate: p.gate, digest, approval: a })
|
|
1682
|
-
: `No approval stands for this plan. Approve it: ${
|
|
1684
|
+
: `No approval stands for this plan. Approve it: ${approve}`;
|
|
1683
1685
|
});
|
|
1684
1686
|
const approval = approvalOf(check);
|
|
1685
1687
|
if (check.satisfied)
|
|
@@ -1691,7 +1693,7 @@ async function decideApplyGate(p, at) {
|
|
|
1691
1693
|
approval,
|
|
1692
1694
|
satisfied: false,
|
|
1693
1695
|
refusal: "not-approved",
|
|
1694
|
-
message: `No approval stands for this plan, so nothing was applied.${why} Approve it: ${
|
|
1696
|
+
message: `No approval stands for this plan, so nothing was applied.${why} Approve it: ${approve}; then run the apply again.`,
|
|
1695
1697
|
};
|
|
1696
1698
|
}
|
|
1697
1699
|
/**
|
|
@@ -1826,14 +1828,19 @@ function reviewCheck(args, p, pr, authorsOnly = false) {
|
|
|
1826
1828
|
return undefined;
|
|
1827
1829
|
};
|
|
1828
1830
|
}
|
|
1831
|
+
/** A waiting wave's or round's approve lines (#4574): one per component when the product's template names `{target}`, as the note names them (#4601). */
|
|
1832
|
+
export function waveApproveLines(op, env, w) {
|
|
1833
|
+
const targets = activeProductWords().approve.includes("{target}") ? (w.components.length > 0 ? w.components : [env]) : [undefined];
|
|
1834
|
+
return targets.map((target) => prApproveCommand({ op, gate: w.gate, digest: w.digest, ...(target !== undefined ? { target } : {}) })).join("; ");
|
|
1835
|
+
}
|
|
1829
1836
|
/** What a `waiting` apply prints (#3999): the round's gate and digest to approve, and how to carry on. */
|
|
1830
|
-
function waitingMessage(op, rounds) {
|
|
1837
|
+
function waitingMessage(op, env, rounds) {
|
|
1831
1838
|
const last = rounds?.at(-1);
|
|
1832
1839
|
if (!last)
|
|
1833
1840
|
return "Some members were held back after an upstream applied.";
|
|
1834
1841
|
return (`${last.components.join(", ")} ${last.components.length === 1 ? "was" : "were"} planned again after an upstream applied, ` +
|
|
1835
1842
|
`and no approval stands for that plan (${last.digest}), so ${last.components.length === 1 ? "it" : "they"} did not apply. ` +
|
|
1836
|
-
`Approve it: ${
|
|
1843
|
+
`Approve it: ${waveApproveLines(op, env, last)}; then run the apply again with the same --resume record.`);
|
|
1837
1844
|
}
|
|
1838
1845
|
/** What a component's settle says in the job log. */
|
|
1839
1846
|
function settleWords(body) {
|
|
@@ -2295,7 +2302,8 @@ async function prApplyWaves(ctx, p, at) {
|
|
|
2295
2302
|
// #4003: the wave's new plan beside the report, for whoever approves its gate.
|
|
2296
2303
|
if (ran.changeSet)
|
|
2297
2304
|
writeWaveChangeSet(ctx, k, ran.changeSet, upload);
|
|
2298
|
-
|
|
2305
|
+
// #4574: the wave's components fill a product's {target}, as the note names them (#4601).
|
|
2306
|
+
const approveLine = waveApproveLines(op, p.env, entry);
|
|
2299
2307
|
const message = ran.exitCode === CHANT_EXIT.moved
|
|
2300
2308
|
? `Wave ${k}'s plan changed after its approval, so nothing in it was applied.${entry.approved ? ` approved: ${entry.approved}; planned now: ${entry.digest}.` : ""} Read the new plan, and if it is right, approve it: ${approveLine}; then run the wave's apply again.`
|
|
2301
2309
|
: `Wave ${k} was planned after the waves before it applied, and the pull request's approved plan does not cover it${entry.moved?.length ? `: ${entry.moved.join("; ")}` : ""}. ` +
|
|
@@ -2652,7 +2660,8 @@ async function runComponentWave(p, at) {
|
|
|
2652
2660
|
// A wave that waits at its own gate is the stream's gate step there, as before op waves (#4003).
|
|
2653
2661
|
if (d && !byPullRequest && (exitCode === CHANT_EXIT.waiting || exitCode === CHANT_EXIT.moved)) {
|
|
2654
2662
|
const waiting = { satisfied: false, pending: { op: at.op }, ...(d.mismatch ? { mismatch: d.mismatch } : {}) };
|
|
2655
|
-
|
|
2663
|
+
const approve = waveApproveLines(at.op, p.env, { gate: d.gate, digest: d.digest, components: at.runs });
|
|
2664
|
+
await emitGateStep(at.events?.emit, { op: at.op, gate: d.gate }, async () => waiting, () => d.mismatch ? `wave ${at.k}'s plan changed after its approval. Approve the plan now: ${approve}` : `wave ${at.k}'s plan is not the one the pull request approved. Approve it: ${approve}`);
|
|
2656
2665
|
}
|
|
2657
2666
|
const read = readWaveOutputs(at.outputsFile);
|
|
2658
2667
|
let changeSet;
|
|
@@ -52,6 +52,15 @@ export declare function nextCommands(req: {
|
|
|
52
52
|
}): string[];
|
|
53
53
|
/** The command line that ran, without `--json`, with `--yes` added: what a dry run says to run next. */
|
|
54
54
|
export declare function sameWithYes(argv: readonly string[]): string;
|
|
55
|
+
/**
|
|
56
|
+
* `release images <label|digest> [-o <file>] [--json]` (#4657): build the
|
|
57
|
+
* images the release recorded again, from the release's commit checked out
|
|
58
|
+
* here, refuse an archive whose digest is not the recorded one, and write the
|
|
59
|
+
* recorded digests to the file the package build reads through
|
|
60
|
+
* `CHANT_RELEASE_DIGESTS` (default `.chant/release-digests.json`). The
|
|
61
|
+
* publish job runs it before the build that packs the package.
|
|
62
|
+
*/
|
|
63
|
+
export declare function runReleaseImages(ctx: CommandContext): Promise<number>;
|
|
55
64
|
/**
|
|
56
65
|
* `release cut [<label>]` (#4026, #4027). A dry run unless `--yes`: it
|
|
57
66
|
* refuses a dirty tree, a commit that is not on trunk and pushed, and one
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../../../src/cli/handlers/release.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;
|
|
1
|
+
{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../../../src/cli/handlers/release.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AAQH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAyBlD,0HAA0H;AAC1H,wBAAgB,YAAY,CAAC,GAAG,EAAE;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,uFAAuF;IACvF,YAAY,EAAE,OAAO,CAAC;CACvB,GAAG,MAAM,EAAE,CASX;AAED,wGAAwG;AACxG,wBAAgB,WAAW,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAG3D;AA8BD;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CA+C3E;AAiBD;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAsTxE;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CA6G5E;AASD;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAwC3E;AAYD;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAkD/E;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAmCzE;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAyC3E;AAED,gHAAgH;AAChH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAsB5E;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAG5E;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAsD5E"}
|
|
@@ -42,10 +42,11 @@
|
|
|
42
42
|
*/
|
|
43
43
|
import { execFileSync } from "node:child_process";
|
|
44
44
|
import { existsSync } from "node:fs";
|
|
45
|
-
import {
|
|
45
|
+
import { tmpdir } from "node:os";
|
|
46
|
+
import { join, relative, resolve } from "node:path";
|
|
46
47
|
import { formatBold, formatError, formatSuccess, formatWarning } from "../format.js";
|
|
47
48
|
import { parseParamFlags } from "../build-params-cli.js";
|
|
48
|
-
const USAGE = "chant release cut [<label>] [--at <sha>] [--yes] [--build <command>] [--param <k=v>] [--image <component>=<repository>@sha256:<hex>] [--params-file <file>] [--src <dir>] [-o <file>] [--lexicon <name>] [--actor <name>] [--sign [<key file>]] [--channel <tag>] [--lane <name>] [--override-green] [--json] | release publish <label|digest> [--yes] [--allow-unsigned] [--require-provenance] [--json] | release verify <label|digest> [--json] | release candidates [--env <env>] [--lane <name>] [--forge-issues] [--json] | release compose <name> [--base <label|sha>] (--pr <n> | --work <id>)... [--yes] [--json] | release list [--json] | release export <label|digest> --env <env> [-o <dir>] [--json]";
|
|
49
|
+
const USAGE = "chant release cut [<label>] [--at <sha>] [--yes] [--build <command>] [--param <k=v>] [--image <component>=<repository>@sha256:<hex>] [--params-file <file>] [--src <dir>] [-o <file>] [--lexicon <name>] [--actor <name>] [--sign [<key file>]] [--channel <tag>] [--lane <name>] [--override-green] [--json] | release publish <label|digest> [--yes] [--allow-unsigned] [--require-provenance] [--json] | release verify <label|digest> [--json] | release images <label|digest> [-o <file>] [--json] | release candidates [--env <env>] [--lane <name>] [--forge-issues] [--json] | release compose <name> [--base <label|sha>] (--pr <n> | --work <id>)... [--yes] [--json] | release list [--json] | release export <label|digest> --env <env> [-o <dir>] [--json]";
|
|
49
50
|
/** The build inputs `release cut` and `release compile` share. */
|
|
50
51
|
function compileInputs(ctx, params, projectDir = resolve("."), releaseLabel) {
|
|
51
52
|
const { args } = ctx;
|
|
@@ -96,6 +97,77 @@ async function laneOf(ctx, cwd) {
|
|
|
96
97
|
return undefined;
|
|
97
98
|
}
|
|
98
99
|
}
|
|
100
|
+
/** The member's `release.images` (#4657), or none when the config declares none. */
|
|
101
|
+
async function releaseImagesOf(cwd) {
|
|
102
|
+
const { loadChantConfig } = await import("../../config.js");
|
|
103
|
+
return (await loadChantConfig(cwd)).config.release?.images ?? [];
|
|
104
|
+
}
|
|
105
|
+
/** A commit's time in seconds, the `SOURCE_DATE_EPOCH` a release's image builds run with (#4657). */
|
|
106
|
+
function commitTime(cwd, commit) {
|
|
107
|
+
return Number(execFileSync("git", ["show", "-s", "--format=%ct", commit], { cwd, encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] }).trim());
|
|
108
|
+
}
|
|
109
|
+
/**
|
|
110
|
+
* `release images <label|digest> [-o <file>] [--json]` (#4657): build the
|
|
111
|
+
* images the release recorded again, from the release's commit checked out
|
|
112
|
+
* here, refuse an archive whose digest is not the recorded one, and write the
|
|
113
|
+
* recorded digests to the file the package build reads through
|
|
114
|
+
* `CHANT_RELEASE_DIGESTS` (default `.chant/release-digests.json`). The
|
|
115
|
+
* publish job runs it before the build that packs the package.
|
|
116
|
+
*/
|
|
117
|
+
export async function runReleaseImages(ctx) {
|
|
118
|
+
const { args } = ctx;
|
|
119
|
+
const ref = args.extraPositional;
|
|
120
|
+
const fail = (code, message, fix) => {
|
|
121
|
+
if (args.json)
|
|
122
|
+
console.log(JSON.stringify({ ref: ref ?? null, error: { code, message, ...(fix ? { fix } : {}) } }, null, 2));
|
|
123
|
+
else
|
|
124
|
+
console.error(formatError({ message: `${message} [${code}]`, ...(fix ? { hint: fix } : {}) }));
|
|
125
|
+
return 1;
|
|
126
|
+
};
|
|
127
|
+
if (!ref)
|
|
128
|
+
return fail("release-not-named", "release images needs a release, by label or digest", USAGE);
|
|
129
|
+
const cwd = resolve(".");
|
|
130
|
+
const { resolveRelease } = await import("../../lifecycle/release-store.js");
|
|
131
|
+
const { buildReleaseImages, releaseImageDigests, writeReleaseDigests, ReleaseImageError, RELEASE_DIGESTS_ENV } = await import("../../lifecycle/release-images.js");
|
|
132
|
+
const { ociArchiveDigest } = await import("../../lifecycle/publish-oci.js");
|
|
133
|
+
const { getHeadCommit } = await import("../../lifecycle/git.js");
|
|
134
|
+
const found = await resolveRelease(ref, { cwd });
|
|
135
|
+
if (!found)
|
|
136
|
+
return fail("release-not-found", `no release is labelled or digested "${ref}" in this member`, "Fetch chant/lifecycle (git fetch origin chant/lifecycle:chant/lifecycle), then list them with: chant release list");
|
|
137
|
+
const { release, label } = found;
|
|
138
|
+
const head = await getHeadCommit({ cwd });
|
|
139
|
+
if (head !== release.commit)
|
|
140
|
+
return fail("release-images-wrong-commit", `the release was cut from ${release.commit.slice(0, 12)}, and this checkout is at ${head.slice(0, 12)}, so its images would not be the release's`, `Check out the release's commit: git checkout ${release.commit}`);
|
|
141
|
+
const declared = await releaseImagesOf(cwd);
|
|
142
|
+
const recorded = releaseImageDigests(release, declared.map((d) => d.name));
|
|
143
|
+
const missing = declared.filter((d) => recorded[d.name] === undefined).map((d) => d.name);
|
|
144
|
+
if (missing.length > 0)
|
|
145
|
+
return fail("release-image-not-recorded", `release.images names ${missing.join(", ")}, which release ${release.releaseDigest} does not record`, "Cut a new release, so its cut builds every image the config declares.");
|
|
146
|
+
let built;
|
|
147
|
+
try {
|
|
148
|
+
built = buildReleaseImages({ images: declared, cwd, sourceDateEpoch: commitTime(cwd, release.commit), label, archiveDigest: ociArchiveDigest });
|
|
149
|
+
}
|
|
150
|
+
catch (err) {
|
|
151
|
+
if (err instanceof ReleaseImageError)
|
|
152
|
+
return fail(err.code, err.message, err.fix);
|
|
153
|
+
throw err;
|
|
154
|
+
}
|
|
155
|
+
const differ = built.filter((a) => recorded[a.component] !== a.digest);
|
|
156
|
+
if (differ.length > 0) {
|
|
157
|
+
return fail("release-image-digest-mismatch", differ.map((a) => `image "${a.component}" built to ${a.digest}, and the release records ${recorded[a.component]}`).join("; "), "An image build must write the same archive from the same commit: set SOURCE_DATE_EPOCH-aware timestamps (rewrite-timestamp=true), and remove logs and caches from its layers.");
|
|
158
|
+
}
|
|
159
|
+
const file = resolve(cwd, args.output ?? ".chant/release-digests.json");
|
|
160
|
+
writeReleaseDigests(file, recorded);
|
|
161
|
+
if (args.json)
|
|
162
|
+
console.log(JSON.stringify({ releaseDigest: release.releaseDigest, label, digests: recorded, file }, null, 2));
|
|
163
|
+
else {
|
|
164
|
+
for (const [name, digest] of Object.entries(recorded))
|
|
165
|
+
console.error(` ${name} ${digest}`);
|
|
166
|
+
console.error(formatSuccess(`Built ${built.length} image(s) to the digests release ${label ?? release.releaseDigest} records, and wrote them to ${relative(cwd, file) || file}`));
|
|
167
|
+
console.log(`${RELEASE_DIGESTS_ENV}=${file}`);
|
|
168
|
+
}
|
|
169
|
+
return 0;
|
|
170
|
+
}
|
|
99
171
|
function describeActorSource(source) {
|
|
100
172
|
switch (source) {
|
|
101
173
|
case "flag":
|
|
@@ -255,7 +327,26 @@ export async function runReleaseCut(ctx) {
|
|
|
255
327
|
if (args.at !== undefined && top && commit)
|
|
256
328
|
checkout = at.checkoutCommit(top, cwd, commit);
|
|
257
329
|
const cutCwd = checkout?.memberDir ?? cwd;
|
|
258
|
-
|
|
330
|
+
// #4657: the images release.images declares are built first, and their digests handed to the build command.
|
|
331
|
+
const declaredImages = await releaseImagesOf(cutCwd);
|
|
332
|
+
const digestsFile = declaredImages.length > 0 ? join(tmpdir(), `chant-release-digests-${process.pid}.json`) : undefined;
|
|
333
|
+
const compiler = spawnTargetCompiler({ ...compileInputs(ctx, params, cutCwd, label), ...(digestsFile ? { releaseDigests: digestsFile } : {}) });
|
|
334
|
+
const buildImages = digestsFile
|
|
335
|
+
? async (at) => {
|
|
336
|
+
const { buildReleaseImages, writeReleaseDigests, ReleaseImageError } = await import("../../lifecycle/release-images.js");
|
|
337
|
+
const { ociArchiveDigest } = await import("../../lifecycle/publish-oci.js");
|
|
338
|
+
try {
|
|
339
|
+
const built = buildReleaseImages({ images: declaredImages, cwd: cutCwd, sourceDateEpoch: commitTime(cutCwd, at), label, archiveDigest: ociArchiveDigest });
|
|
340
|
+
writeReleaseDigests(digestsFile, Object.fromEntries(built.map((a) => [a.component, a.digest])));
|
|
341
|
+
return built;
|
|
342
|
+
}
|
|
343
|
+
catch (err) {
|
|
344
|
+
const code = err instanceof ReleaseImageError ? err.code : err.code;
|
|
345
|
+
const fix = err instanceof ReleaseImageError ? err.fix : undefined;
|
|
346
|
+
throw new ReleaseCutError(code === "release-image-name-taken" ? "release-image-name-taken" : "release-image-build-failed", `no release was cut: ${err.message}`, fix);
|
|
347
|
+
}
|
|
348
|
+
}
|
|
349
|
+
: undefined;
|
|
259
350
|
// #4692: the lane is the commit's own config's under --at.
|
|
260
351
|
const lane = await laneOf(ctx, cutCwd);
|
|
261
352
|
const request = {
|
|
@@ -269,6 +360,7 @@ export async function runReleaseCut(ctx) {
|
|
|
269
360
|
...(lane !== undefined ? { lane } : {}),
|
|
270
361
|
...(args.overrideGreen ? { overrideGreen: true } : {}),
|
|
271
362
|
...(Object.keys(images).length > 0 ? { images } : {}),
|
|
363
|
+
...(buildImages ? { buildImages } : {}),
|
|
272
364
|
};
|
|
273
365
|
if (dryRun) {
|
|
274
366
|
const plan = await planRelease(request);
|
|
@@ -576,6 +668,8 @@ export async function runReleasePublish(ctx) {
|
|
|
576
668
|
/** One item a target publishes, for a line: what, where, and the SBOM or attachment it is (#4049). */
|
|
577
669
|
function describeItem(i) {
|
|
578
670
|
const what = i.attachment === "sbom" ? `${i.name} (SBOM)` : i.attachment === "provenance" ? `${i.name} (provenance)` : i.name;
|
|
671
|
+
if (i.notes !== undefined)
|
|
672
|
+
return `${i.name} to ${i.destination}:\n${i.notes.trimEnd().split("\n").map((l) => ` ${l}`.trimEnd()).join("\n")}`;
|
|
579
673
|
return `${what} to ${i.destination}${i.sbom ? `, carrying ${i.sbom}` : ""}`;
|
|
580
674
|
}
|
|
581
675
|
/**
|
|
@@ -600,7 +694,13 @@ export async function runReleaseVerify(ctx) {
|
|
|
600
694
|
console.error(formatError({ message: `${result.error.message} [${result.error.code}]`, ...(result.error.fix ? { hint: result.error.fix } : {}) }));
|
|
601
695
|
return 1;
|
|
602
696
|
}
|
|
603
|
-
|
|
697
|
+
let code = verificationCode(result);
|
|
698
|
+
// #4657: a package built here that pins an image digest the release does not record fails the check.
|
|
699
|
+
const pins = code ? null : await unknownPackagePins(resolve("."), result.releaseDigest);
|
|
700
|
+
if (pins) {
|
|
701
|
+
code = "release-pin-unknown";
|
|
702
|
+
result.reason = pins;
|
|
703
|
+
}
|
|
604
704
|
if (args.json) {
|
|
605
705
|
console.log(JSON.stringify({ ...result, ...(code ? { error: { code, message: result.reason } } : {}) }, null, 2));
|
|
606
706
|
return code ? 1 : 0;
|
|
@@ -612,13 +712,22 @@ export async function runReleaseVerify(ctx) {
|
|
|
612
712
|
if (code) {
|
|
613
713
|
console.error(formatError({
|
|
614
714
|
message: `${name} does not verify: ${result.reason} [${code}]`,
|
|
615
|
-
hint: code === "release-digest-mismatch" ? "Do not publish or deploy it; cut the release again." : `Cut it again signed with a key ${result.signers.path} lists: chant release cut ${result.label ?? "<label>"} --sign --yes`,
|
|
715
|
+
hint: code === "release-digest-mismatch" ? "Do not publish or deploy it; cut the release again." : code === "release-pin-unknown" ? "Build the package from the digests the release records: chant release images <label>, then the build with CHANT_RELEASE_DIGESTS set." : `Cut it again signed with a key ${result.signers.path} lists: chant release cut ${result.label ?? "<label>"} --sign --yes`,
|
|
616
716
|
}));
|
|
617
717
|
return 1;
|
|
618
718
|
}
|
|
619
719
|
console.error(formatSuccess(`Verified ${name}: ${result.reason}`));
|
|
620
720
|
return 0;
|
|
621
721
|
}
|
|
722
|
+
/** The first package built here that pins an image digest release `digest` does not record (#4657), said in a sentence, or null. */
|
|
723
|
+
async function unknownPackagePins(cwd, digest) {
|
|
724
|
+
const { loadChantConfig } = await import("../../config.js");
|
|
725
|
+
const { readRelease } = await import("../../lifecycle/release-store.js");
|
|
726
|
+
const { packagePinProblem } = await import("../../lifecycle/release-images.js");
|
|
727
|
+
const targets = (await loadChantConfig(cwd).catch(() => null))?.config.release?.publish ?? [];
|
|
728
|
+
const release = await readRelease(digest, { cwd });
|
|
729
|
+
return release ? packagePinProblem(cwd, release, targets) : null;
|
|
730
|
+
}
|
|
622
731
|
/**
|
|
623
732
|
* `release candidates [--env <env>] [--forge-issues] [--json]` (#4168 4.2):
|
|
624
733
|
* the green commits of trunk a release can be cut from, newest first, each
|
package/dist/cli/main.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":";AAEA,OAAO,EAAoB,KAAK,cAAc,EAAE,KAAK,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAItG,OAAO,EAAkB,KAAK,UAAU,EAAmB,MAAM,YAAY,CAAC;AAa9E,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAgB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAG3D,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":";AAEA,OAAO,EAAoB,KAAK,cAAc,EAAE,KAAK,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAItG,OAAO,EAAkB,KAAK,UAAU,EAAmB,MAAM,YAAY,CAAC;AAa9E,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAgB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAG3D,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,CAAC;AA+rDzC;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,mBAAmB,GAAG,cAAc,CAAC;IAAC,GAAG,CAAC,EAAE,OAAO,qBAAqB,EAAE,cAAc,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,2BAA2B,EAAE,eAAe,CAAA;CAAO,GAC7K,OAAO,CAAC,MAAM,CAAC,CAuCjB;AAID;;;;;;;;;GASG;AACH,eAAO,MAAM,eAAe,EAAE,UAAU,EAwQvC,CAAC"}
|