@intentius/chant 0.124.55 → 0.124.56
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.map +1 -1
- package/dist/ci-agent.js +1 -2
- package/dist/ci-audit/attribution.d.ts +111 -0
- package/dist/ci-audit/attribution.d.ts.map +1 -0
- package/dist/ci-audit/attribution.js +194 -0
- package/dist/ci-audit/audit-log.d.ts +144 -0
- package/dist/ci-audit/audit-log.d.ts.map +1 -0
- package/dist/ci-audit/audit-log.js +149 -0
- package/dist/ci-audit/index.d.ts +12 -0
- package/dist/ci-audit/index.d.ts.map +1 -0
- package/dist/ci-audit/index.js +12 -0
- package/dist/ci-audit/unrecorded.d.ts +74 -0
- package/dist/ci-audit/unrecorded.d.ts.map +1 -0
- package/dist/ci-audit/unrecorded.js +95 -0
- package/dist/ci-audit.d.ts +3 -0
- package/dist/ci-audit.d.ts.map +1 -0
- package/dist/ci-audit.js +2 -0
- package/dist/ci-control.d.ts.map +1 -1
- package/dist/ci-control.js +3 -4
- package/dist/ci-estate.d.ts +24 -0
- package/dist/ci-estate.d.ts.map +1 -1
- package/dist/ci-estate.js +1 -2
- package/dist/ci-identity.d.ts.map +1 -1
- package/dist/ci-identity.js +2 -3
- package/dist/ci-job-guard.d.ts +139 -0
- package/dist/ci-job-guard.d.ts.map +1 -0
- package/dist/ci-job-guard.js +287 -0
- package/dist/ci-jobs.d.ts +7 -0
- package/dist/ci-jobs.d.ts.map +1 -1
- package/dist/ci-jobs.js +7 -0
- package/dist/ci-product-words.d.ts +7 -1
- package/dist/ci-product-words.d.ts.map +1 -1
- package/dist/ci-product-words.js +38 -4
- package/dist/ci-product.d.ts +35 -0
- package/dist/ci-product.d.ts.map +1 -1
- package/dist/ci-product.js +38 -3
- package/dist/ci-respond-run.d.ts +73 -0
- package/dist/ci-respond-run.d.ts.map +1 -0
- package/dist/ci-respond-run.js +247 -0
- package/dist/ci-respond.d.ts +189 -0
- package/dist/ci-respond.d.ts.map +1 -0
- package/dist/ci-respond.js +285 -0
- package/dist/cli/handlers/audit-log.d.ts +12 -0
- package/dist/cli/handlers/audit-log.d.ts.map +1 -0
- package/dist/cli/handlers/audit-log.js +81 -0
- package/dist/cli/handlers/build.d.ts +7 -0
- package/dist/cli/handlers/build.d.ts.map +1 -1
- package/dist/cli/handlers/build.js +81 -0
- package/dist/cli/handlers/ci-check-job.d.ts +11 -0
- package/dist/cli/handlers/ci-check-job.d.ts.map +1 -0
- package/dist/cli/handlers/ci-check-job.js +27 -0
- package/dist/cli/handlers/ci-check.d.ts.map +1 -1
- package/dist/cli/handlers/ci-check.js +38 -9
- package/dist/cli/handlers/e2e-safe-run.d.ts +12 -0
- package/dist/cli/handlers/e2e-safe-run.d.ts.map +1 -0
- package/dist/cli/handlers/e2e-safe-run.js +23 -0
- package/dist/cli/handlers/pr.d.ts +5 -0
- package/dist/cli/handlers/pr.d.ts.map +1 -1
- package/dist/cli/handlers/pr.js +259 -4
- package/dist/cli/handlers/run-wave.js +89 -1
- package/dist/cli/main.d.ts.map +1 -1
- package/dist/cli/main.js +56 -2
- package/dist/cli/parse-args.d.ts.map +1 -1
- package/dist/cli/parse-args.js +107 -0
- package/dist/cli/registry.d.ts +38 -0
- package/dist/cli/registry.d.ts.map +1 -1
- package/dist/components/adoption.d.ts.map +1 -1
- package/dist/components/adoption.js +1 -2
- package/dist/components/capability.d.ts +37 -0
- package/dist/components/capability.d.ts.map +1 -1
- package/dist/components/capability.js +25 -0
- package/dist/components/check-hooks.d.ts +4 -1
- package/dist/components/check-hooks.d.ts.map +1 -1
- package/dist/components/check-steps.d.ts +74 -0
- package/dist/components/check-steps.d.ts.map +1 -0
- package/dist/components/check-steps.js +102 -0
- package/dist/components/ci-services.d.ts.map +1 -1
- package/dist/components/ci-services.js +1 -2
- package/dist/components/driver.d.ts +12 -0
- package/dist/components/driver.d.ts.map +1 -1
- package/dist/components/driver.js +35 -1
- package/dist/components/groups.d.ts.map +1 -1
- package/dist/components/groups.js +4 -3
- package/dist/components/pr-env-ledger.d.ts.map +1 -1
- package/dist/components/pr-env-ledger.js +1 -2
- package/dist/components/pr-environment.d.ts +1 -1
- package/dist/components/pr-environment.d.ts.map +1 -1
- package/dist/components/pr-environment.js +1 -1
- package/dist/components/pr-pipeline.d.ts +129 -3
- package/dist/components/pr-pipeline.d.ts.map +1 -1
- package/dist/components/pr-pipeline.js +153 -17
- package/dist/components/pr-run.d.ts +8 -0
- package/dist/components/pr-run.d.ts.map +1 -1
- package/dist/components/pr-run.js +9 -4
- package/dist/components/product-pipeline.d.ts +35 -2
- package/dist/components/product-pipeline.d.ts.map +1 -1
- package/dist/components/product-pipeline.js +24 -5
- package/dist/components/wave-plan.d.ts +8 -0
- package/dist/components/wave-plan.d.ts.map +1 -1
- package/dist/components/wave-plan.js +18 -2
- package/dist/e2e-harness/bucket.d.ts +21 -0
- package/dist/e2e-harness/bucket.d.ts.map +1 -0
- package/dist/e2e-harness/bucket.js +61 -0
- package/dist/e2e-harness/claim.d.ts +70 -0
- package/dist/e2e-harness/claim.d.ts.map +1 -0
- package/dist/e2e-harness/claim.js +98 -0
- package/dist/e2e-harness/driver.d.ts +64 -0
- package/dist/e2e-harness/driver.d.ts.map +1 -0
- package/dist/e2e-harness/driver.js +243 -0
- package/dist/e2e-harness/forgejo.d.ts +77 -0
- package/dist/e2e-harness/forgejo.d.ts.map +1 -0
- package/dist/e2e-harness/forgejo.js +205 -0
- package/dist/e2e-harness/git.d.ts +32 -0
- package/dist/e2e-harness/git.d.ts.map +1 -0
- package/dist/e2e-harness/git.js +67 -0
- package/dist/e2e-harness/index.d.ts +22 -0
- package/dist/e2e-harness/index.d.ts.map +1 -0
- package/dist/e2e-harness/index.js +48 -0
- package/dist/e2e-harness/jobs.d.ts +8 -0
- package/dist/e2e-harness/jobs.d.ts.map +1 -0
- package/dist/e2e-harness/jobs.js +34 -0
- package/dist/e2e-harness/pins.d.ts +45 -0
- package/dist/e2e-harness/pins.d.ts.map +1 -0
- package/dist/e2e-harness/pins.js +44 -0
- package/dist/e2e-harness/ports.d.ts +113 -0
- package/dist/e2e-harness/ports.d.ts.map +1 -0
- package/dist/e2e-harness/ports.js +4 -0
- package/dist/e2e-harness/reports.d.ts +45 -0
- package/dist/e2e-harness/reports.d.ts.map +1 -0
- package/dist/e2e-harness/reports.js +57 -0
- package/dist/e2e-harness/safe-run-cli.d.ts +17 -0
- package/dist/e2e-harness/safe-run-cli.d.ts.map +1 -0
- package/dist/e2e-harness/safe-run-cli.js +43 -0
- package/dist/e2e-harness/safe-run.d.ts +61 -0
- package/dist/e2e-harness/safe-run.d.ts.map +1 -0
- package/dist/e2e-harness/safe-run.js +172 -0
- package/dist/e2e-harness/scenario.d.ts +11 -0
- package/dist/e2e-harness/scenario.d.ts.map +1 -0
- package/dist/e2e-harness/scenario.js +89 -0
- package/dist/e2e-harness/schemas/demo-cycle.schema.json +282 -0
- package/dist/e2e-harness/schemas/demo-step.schema.json +245 -0
- package/dist/e2e-harness/schemas/e2e-claim-row.schema.json +33 -0
- package/dist/e2e-harness/schemas/e2e-claims.schema.json +18 -0
- package/dist/e2e-harness/schemas/e2e-scenario.schema.json +150 -0
- package/dist/e2e-harness/schemas/index.d.ts +191 -0
- package/dist/e2e-harness/schemas/index.d.ts.map +1 -0
- package/dist/e2e-harness/schemas/index.js +62 -0
- package/dist/e2e-harness/stack.d.ts +124 -0
- package/dist/e2e-harness/stack.d.ts.map +1 -0
- package/dist/e2e-harness/stack.js +207 -0
- package/dist/e2e-harness/steps.d.ts +11 -0
- package/dist/e2e-harness/steps.d.ts.map +1 -0
- package/dist/e2e-harness/steps.js +22 -0
- package/dist/e2e-harness.d.ts +3 -0
- package/dist/e2e-harness.d.ts.map +1 -0
- package/dist/e2e-harness.js +2 -0
- package/dist/exit-codes.d.ts +7 -1
- package/dist/exit-codes.d.ts.map +1 -1
- package/dist/exit-codes.js +7 -1
- package/dist/lexicon.d.ts +46 -0
- package/dist/lexicon.d.ts.map +1 -1
- package/dist/lifecycle/gate-ledger.d.ts.map +1 -1
- package/dist/lifecycle/gate-ledger.js +2 -3
- package/dist/lifecycle/gated-request.d.ts.map +1 -1
- package/dist/lifecycle/gated-request.js +1 -2
- package/dist/lifecycle/query.d.ts.map +1 -1
- package/dist/lifecycle/query.js +4 -5
- package/dist/lifecycle/release-catalog.d.ts.map +1 -1
- package/dist/lifecycle/release-catalog.js +1 -1
- package/dist/lifecycle/release-ledger.d.ts.map +1 -1
- package/dist/lifecycle/release-ledger.js +1 -2
- package/dist/lifecycle/release-status.d.ts +20 -0
- package/dist/lifecycle/release-status.d.ts.map +1 -1
- package/dist/lifecycle/release-status.js +1 -22
- package/dist/lifecycle/wave-plans.d.ts +23 -7
- package/dist/lifecycle/wave-plans.d.ts.map +1 -1
- package/dist/lifecycle/wave-plans.js +9 -2
- package/dist/op/approval-status.d.ts +103 -0
- package/dist/op/approval-status.d.ts.map +1 -0
- package/dist/op/approval-status.js +197 -0
- package/dist/op/index.d.ts +1 -1
- package/dist/op/index.d.ts.map +1 -1
- package/dist/op/index.js +1 -1
- package/dist/op/op-waves-capability-spec.d.ts +8 -0
- package/dist/op/op-waves-capability-spec.d.ts.map +1 -1
- package/dist/op/op-waves-capability-spec.js +21 -0
- package/dist/op/op-waves-release.d.ts.map +1 -1
- package/dist/op/op-waves-release.js +1 -2
- package/dist/op/op-waves-run.d.ts +7 -2
- package/dist/op/op-waves-run.d.ts.map +1 -1
- package/dist/op/op-waves-run.js +96 -4
- package/dist/op/op-waves-stand-down.d.ts.map +1 -1
- package/dist/op/op-waves-stand-down.js +1 -2
- package/dist/op/op-waves.d.ts +35 -0
- package/dist/op/op-waves.d.ts.map +1 -1
- package/dist/op/op-waves.js +46 -6
- package/dist/op/runtime.d.ts +4 -0
- package/dist/op/runtime.d.ts.map +1 -1
- package/dist/op/runtime.js +2 -3
- package/dist/otlp.d.ts.map +1 -1
- package/dist/otlp.js +1 -2
- package/dist/parallelism.d.ts +17 -0
- package/dist/parallelism.d.ts.map +1 -0
- package/dist/parallelism.js +33 -0
- package/dist/policy-source.d.ts.map +1 -1
- package/dist/policy-source.js +1 -2
- package/dist/pr-forge.d.ts.map +1 -1
- package/dist/pr-forge.js +56 -39
- package/dist/pr-loop.d.ts +9 -0
- package/dist/pr-loop.d.ts.map +1 -1
- package/dist/pr-loop.js +22 -3
- package/dist/pr-merge.d.ts +64 -0
- package/dist/pr-merge.d.ts.map +1 -0
- package/dist/pr-merge.js +78 -0
- package/dist/pr-post.d.ts +70 -1
- package/dist/pr-post.d.ts.map +1 -1
- package/dist/pr-post.js +116 -5
- package/dist/pr-report-url.d.ts.map +1 -1
- package/dist/pr-report-url.js +1 -2
- package/dist/release-floors.d.ts +1 -1
- package/dist/release-floors.js +1 -1
- package/dist/run-event.d.ts.map +1 -1
- package/dist/run-event.js +1 -2
- package/dist/scheduled-op-cloud.d.ts +32 -0
- package/dist/scheduled-op-cloud.d.ts.map +1 -0
- package/dist/scheduled-op-cloud.js +69 -0
- package/dist/wave-runtime.mjs +340 -327
- package/dist/workspace/ci-lock-grain.d.ts +5 -0
- package/dist/workspace/ci-lock-grain.d.ts.map +1 -1
- package/dist/workspace/ci-lock-grain.js +1 -7
- package/dist/workspace/ci-run.d.ts.map +1 -1
- package/dist/workspace/ci-run.js +5 -1
- package/dist/workspace/pr-report.schema.json +5 -0
- package/package.json +1 -1
- package/src/ci-agent.ts +1 -2
- package/src/ci-audit/__fixtures__/cloudtrail-lookup-bucket.json +37 -0
- package/src/ci-audit/__fixtures__/cloudtrail-writes-window.json +59 -0
- package/src/ci-audit/attribution.ts +260 -0
- package/src/ci-audit/audit-log.ts +220 -0
- package/src/ci-audit/ci-audit.test.ts +175 -0
- package/src/ci-audit/index.ts +15 -0
- package/src/ci-audit/unrecorded.ts +140 -0
- package/src/ci-audit.ts +2 -0
- package/src/ci-control.ts +3 -4
- package/src/ci-estate.ts +1 -2
- package/src/ci-identity-database.test.ts +2 -3
- package/src/ci-identity-targets.test.ts +1 -3
- package/src/ci-identity.ts +2 -3
- package/src/ci-job-guard.test.ts +154 -0
- package/src/ci-job-guard.ts +319 -0
- package/src/ci-jobs.ts +8 -0
- package/src/ci-product-comment-targets.test.ts +45 -0
- package/src/ci-product-words.ts +35 -6
- package/src/ci-product.ts +55 -3
- package/src/ci-respond-run.ts +291 -0
- package/src/ci-respond.test.ts +264 -0
- package/src/ci-respond.ts +412 -0
- package/src/cli/handlers/audit-log.ts +74 -0
- package/src/cli/handlers/build-pr-loop-flags.test.ts +98 -0
- package/src/cli/handlers/build.ts +69 -0
- package/src/cli/handlers/ci-check-job.test.ts +114 -0
- package/src/cli/handlers/ci-check-job.ts +33 -0
- package/src/cli/handlers/ci-check.ts +38 -8
- package/src/cli/handlers/e2e-safe-run.ts +27 -0
- package/src/cli/handlers/pr-plan-comment-targets.test.ts +166 -0
- package/src/cli/handlers/pr-plan-flags.test.ts +161 -0
- package/src/cli/handlers/pr.ts +228 -4
- package/src/cli/handlers/run-wave.ts +79 -1
- package/src/cli/main.test.ts +1 -1
- package/src/cli/main.ts +56 -2
- package/src/cli/parse-args.ts +77 -0
- package/src/cli/registry.ts +38 -0
- package/src/components/adoption.ts +1 -2
- package/src/components/capability.ts +50 -0
- package/src/components/check-hooks.ts +4 -1
- package/src/components/check-steps.test.ts +70 -0
- package/src/components/check-steps.ts +158 -0
- package/src/components/ci-services.ts +1 -2
- package/src/components/driver.ts +35 -1
- package/src/components/groups.ts +4 -2
- package/src/components/plan-flags.test.ts +46 -0
- package/src/components/pr-comment-preview-targets.test.ts +34 -0
- package/src/components/pr-env-ledger.ts +1 -2
- package/src/components/pr-env-run-bundle.test.ts +0 -20
- package/src/components/pr-environment.ts +1 -1
- package/src/components/pr-pipeline-runners.test.ts +80 -0
- package/src/components/pr-pipeline.ts +232 -17
- package/src/components/pr-run.ts +17 -6
- package/src/components/pr-stale-job.test.ts +34 -0
- package/src/components/product-pipeline.ts +50 -8
- package/src/components/wave-plan.ts +18 -2
- package/src/e2e-harness/__project__/chant.config.ts +4 -0
- package/src/e2e-harness/__project__/src/compose.ts +33 -0
- package/src/e2e-harness/bucket.ts +69 -0
- package/src/e2e-harness/claim.test.ts +150 -0
- package/src/e2e-harness/claim.ts +140 -0
- package/src/e2e-harness/driver.test.ts +304 -0
- package/src/e2e-harness/driver.ts +294 -0
- package/src/e2e-harness/forgejo.ts +267 -0
- package/src/e2e-harness/git.ts +96 -0
- package/src/e2e-harness/index.ts +50 -0
- package/src/e2e-harness/jobs.ts +35 -0
- package/src/e2e-harness/pins.ts +52 -0
- package/src/e2e-harness/ports.ts +130 -0
- package/src/e2e-harness/reports.ts +79 -0
- package/src/e2e-harness/safe-run-cli.test.ts +102 -0
- package/src/e2e-harness/safe-run-cli.ts +54 -0
- package/src/e2e-harness/safe-run.ts +198 -0
- package/src/e2e-harness/scenario.ts +89 -0
- package/src/e2e-harness/schemas/README.md +62 -0
- package/src/e2e-harness/schemas/demo-cycle.schema.json +282 -0
- package/src/e2e-harness/schemas/demo-step.schema.json +245 -0
- package/src/e2e-harness/schemas/e2e-claim-row.schema.json +33 -0
- package/src/e2e-harness/schemas/e2e-claims.schema.json +18 -0
- package/src/e2e-harness/schemas/e2e-scenario.schema.json +150 -0
- package/src/e2e-harness/schemas/index.ts +220 -0
- package/src/e2e-harness/schemas.test.ts +145 -0
- package/src/e2e-harness/stack.test.ts +124 -0
- package/src/e2e-harness/stack.ts +306 -0
- package/src/e2e-harness/steps.ts +30 -0
- package/src/e2e-harness.ts +2 -0
- package/src/exit-codes.test.ts +3 -2
- package/src/exit-codes.ts +7 -1
- package/src/gate-decision-bundle.test.ts +0 -2
- package/src/lexicon.ts +48 -0
- package/src/lifecycle/control-entries-ledger.test.ts +2 -3
- package/src/lifecycle/gate-ledger.ts +2 -3
- package/src/lifecycle/gated-request.ts +1 -2
- package/src/lifecycle/query.ts +4 -5
- package/src/lifecycle/release-catalog.test.ts +3 -4
- package/src/lifecycle/release-catalog.ts +1 -1
- package/src/lifecycle/release-ledger.ts +1 -2
- package/src/lifecycle/release-status.test.ts +3 -4
- package/src/lifecycle/release-status.ts +1 -2
- package/src/lifecycle/wave-plans.ts +33 -5
- package/src/op/approval-status.test.ts +134 -0
- package/src/op/approval-status.ts +235 -0
- package/src/op/gate-review.test.ts +2 -1
- package/src/op/index.ts +2 -0
- package/src/op/op-waves-after-plan.test.ts +12 -0
- package/src/op/op-waves-capability-spec.ts +20 -0
- package/src/op/op-waves-parallelism.test.ts +89 -0
- package/src/op/op-waves-pull-request.test.ts +78 -1
- package/src/op/op-waves-release.ts +1 -2
- package/src/op/op-waves-run.ts +94 -4
- package/src/op/op-waves-stand-down.ts +1 -2
- package/src/op/op-waves.ts +63 -6
- package/src/op/runtime.ts +6 -3
- package/src/otlp.ts +1 -2
- package/src/parallelism.test.ts +38 -0
- package/src/parallelism.ts +33 -0
- package/src/policy-source.ts +1 -2
- package/src/pr-forge-bundle.test.ts +1 -1
- package/src/pr-forge.ts +54 -35
- package/src/pr-loop-bundle.test.ts +1 -1
- package/src/pr-loop-narrowed.test.ts +63 -0
- package/src/pr-loop.ts +30 -3
- package/src/pr-merge.test.ts +100 -0
- package/src/pr-merge.ts +105 -0
- package/src/pr-post-stale.test.ts +163 -0
- package/src/pr-post.ts +159 -5
- package/src/pr-report-url.ts +1 -2
- package/src/product-subpaths-plain-node.e2e.test.ts +1 -0
- package/src/release-floors.ts +1 -1
- package/src/run-event.ts +1 -2
- package/src/scheduled-op-cloud.ts +68 -0
- package/src/stage-hooks-bundle.test.ts +0 -2
- package/src/workspace/ci-lock-grain.ts +1 -2
- package/src/workspace/ci-run.ts +5 -1
- package/src/workspace/pr-report.schema.json +5 -0
package/dist/pr-forge.js
CHANGED
|
@@ -162,6 +162,9 @@ export class ForgeApiError extends Error {
|
|
|
162
162
|
this.name = "ForgeApiError";
|
|
163
163
|
}
|
|
164
164
|
}
|
|
165
|
+
/** The forge answered 404. */
|
|
166
|
+
const notFound = (err) => err instanceof ForgeApiError && err.status === 404;
|
|
167
|
+
const byNumber = (a, b) => a.number - b.number;
|
|
165
168
|
const DEFAULT_HOST = { github: "github.com", gitlab: "gitlab.com", forgejo: null };
|
|
166
169
|
/** `<forge>:<login>` on the forge's default host, `<forge>@<host>:<login>` elsewhere, lower-cased (#3163's form). */
|
|
167
170
|
export function forgePrincipalOf(kind, host, login) {
|
|
@@ -341,6 +344,24 @@ function githubShaped(kind, opts) {
|
|
|
341
344
|
const url = str(v.html_url);
|
|
342
345
|
return { number, title: str(v.title) ?? "", body: str(v.body) ?? "", head: head ?? "", ...(base ? { base } : {}), ...(url ? { url } : {}) };
|
|
343
346
|
};
|
|
347
|
+
/**
|
|
348
|
+
* The open pull requests; GitHub takes `filter` server-side, Forgejo's list
|
|
349
|
+
* takes none and is matched by the caller. Forgejo answers the list with
|
|
350
|
+
* 404 while it still counts the repository as empty (just after the first
|
|
351
|
+
* push). That is no pull request; a repository that is really missing 404s
|
|
352
|
+
* on its own read too.
|
|
353
|
+
*/
|
|
354
|
+
const openPulls = async (filter) => {
|
|
355
|
+
try {
|
|
356
|
+
return await api.list(`${repo}/pulls?state=open${kind === "github" ? filter : ""}`, pageParams, pageSize);
|
|
357
|
+
}
|
|
358
|
+
catch (err) {
|
|
359
|
+
if (kind !== "forgejo" || !notFound(err))
|
|
360
|
+
throw err;
|
|
361
|
+
await api.call("GET", repo);
|
|
362
|
+
return [];
|
|
363
|
+
}
|
|
364
|
+
};
|
|
344
365
|
/** A pull request whose head branch lives in this repository, not a fork. */
|
|
345
366
|
const fromHere = (v, head) => {
|
|
346
367
|
if (!isObject(v) || !isObject(v.head) || v.head.ref !== head)
|
|
@@ -396,7 +417,7 @@ function githubShaped(kind, opts) {
|
|
|
396
417
|
b = await api.call("GET", `${repo}/branches/${branch.split("/").map(encodeURIComponent).join("/")}`);
|
|
397
418
|
}
|
|
398
419
|
catch (err) {
|
|
399
|
-
if (err
|
|
420
|
+
if (notFound(err))
|
|
400
421
|
return undefined;
|
|
401
422
|
throw err;
|
|
402
423
|
}
|
|
@@ -556,7 +577,7 @@ function githubShaped(kind, opts) {
|
|
|
556
577
|
return isObject(got) && got.state === "open" && got.merged !== true;
|
|
557
578
|
}
|
|
558
579
|
catch (err) {
|
|
559
|
-
if (err
|
|
580
|
+
if (notFound(err))
|
|
560
581
|
return false;
|
|
561
582
|
throw err;
|
|
562
583
|
}
|
|
@@ -568,7 +589,7 @@ function githubShaped(kind, opts) {
|
|
|
568
589
|
return isObject(pr) && typeof pr.number === "number" ? pr.number : null;
|
|
569
590
|
}
|
|
570
591
|
catch (err) {
|
|
571
|
-
if (err
|
|
592
|
+
if (notFound(err))
|
|
572
593
|
return null;
|
|
573
594
|
throw err;
|
|
574
595
|
}
|
|
@@ -597,37 +618,12 @@ function githubShaped(kind, opts) {
|
|
|
597
618
|
// GitHub filters by `owner:branch` server-side; Forgejo's list takes no
|
|
598
619
|
// head filter, so every open page is read and matched here.
|
|
599
620
|
const owner = opts.repo.split("/")[0];
|
|
600
|
-
const
|
|
601
|
-
|
|
602
|
-
try {
|
|
603
|
-
listed = await api.list(`${repo}/pulls${query}`, pageParams, pageSize);
|
|
604
|
-
}
|
|
605
|
-
catch (err) {
|
|
606
|
-
// Forgejo answers the list with 404 while it still counts the repository
|
|
607
|
-
// as empty (just after the first push). That is no pull request; a
|
|
608
|
-
// repository that is really missing 404s on its own read too.
|
|
609
|
-
if (kind !== "forgejo" || !(err instanceof ForgeApiError) || err.status !== 404)
|
|
610
|
-
throw err;
|
|
611
|
-
await api.call("GET", repo);
|
|
612
|
-
return undefined;
|
|
613
|
-
}
|
|
614
|
-
const open = listed.filter((p) => fromHere(p, head));
|
|
615
|
-
return open.map(pull).filter((p) => p !== undefined).sort((a, b) => a.number - b.number)[0];
|
|
621
|
+
const open = (await openPulls(`&head=${encodeURIComponent(`${owner}:${head}`)}`)).filter((p) => fromHere(p, head));
|
|
622
|
+
return open.map(pull).filter((p) => p !== undefined).sort(byNumber)[0];
|
|
616
623
|
},
|
|
617
624
|
async openPullRequests(base) {
|
|
618
625
|
// GitHub filters by base server-side; Forgejo's list is matched here.
|
|
619
|
-
const
|
|
620
|
-
let listed;
|
|
621
|
-
try {
|
|
622
|
-
listed = await api.list(`${repo}/pulls${query}`, pageParams, pageSize);
|
|
623
|
-
}
|
|
624
|
-
catch (err) {
|
|
625
|
-
// Forgejo answers 404 while it counts the repository as empty, as findPullRequest notes.
|
|
626
|
-
if (kind !== "forgejo" || !(err instanceof ForgeApiError) || err.status !== 404)
|
|
627
|
-
throw err;
|
|
628
|
-
await api.call("GET", repo);
|
|
629
|
-
return [];
|
|
630
|
-
}
|
|
626
|
+
const listed = await openPulls(`&base=${encodeURIComponent(base)}`);
|
|
631
627
|
const out = [];
|
|
632
628
|
for (const v of listed) {
|
|
633
629
|
if (!isObject(v) || !isObject(v.head) || !isObject(v.base))
|
|
@@ -642,7 +638,7 @@ function githubShaped(kind, opts) {
|
|
|
642
638
|
const author = isObject(v.user) ? str(v.user.login) : undefined;
|
|
643
639
|
out.push({ number, head, headSha, base: into, ...(baseSha ? { baseSha } : {}), ...(author ? { author } : {}), fork: !fromHere(v, head) });
|
|
644
640
|
}
|
|
645
|
-
return out.sort(
|
|
641
|
+
return out.sort(byNumber);
|
|
646
642
|
},
|
|
647
643
|
branchHead: branchTip,
|
|
648
644
|
async pullRequestHead(pr) {
|
|
@@ -651,7 +647,7 @@ function githubShaped(kind, opts) {
|
|
|
651
647
|
got = await api.call("GET", `${repo}/pulls/${pr}`);
|
|
652
648
|
}
|
|
653
649
|
catch (err) {
|
|
654
|
-
if (err
|
|
650
|
+
if (notFound(err))
|
|
655
651
|
return undefined;
|
|
656
652
|
throw err;
|
|
657
653
|
}
|
|
@@ -812,6 +808,8 @@ export function gitlabForge(opts) {
|
|
|
812
808
|
return { id, body: str(v.description) ?? "", ...(created ? { created } : {}), ...(str(v.title) !== undefined ? { title: str(v.title) } : {}), ...(author ? { author } : {}), ...(url ? { url } : {}) };
|
|
813
809
|
};
|
|
814
810
|
const notes = `${project}/merge_requests`;
|
|
811
|
+
/** The open merge requests from (`source`) or into (`target`) `branch`. */
|
|
812
|
+
const openMrs = (end, branch) => api.list(`${notes}?state=opened&${end}_branch=${encodeURIComponent(branch)}`, pageParams, 100);
|
|
815
813
|
const mergeRequest = (v) => {
|
|
816
814
|
if (!isObject(v))
|
|
817
815
|
return undefined;
|
|
@@ -952,7 +950,7 @@ export function gitlabForge(opts) {
|
|
|
952
950
|
member = await api.call("GET", `${project}/members/all/${id}`);
|
|
953
951
|
}
|
|
954
952
|
catch (err) {
|
|
955
|
-
if (err
|
|
953
|
+
if (notFound(err))
|
|
956
954
|
return `${login} is not a member`;
|
|
957
955
|
return `could not read ${login}'s access (${err instanceof Error ? err.message : String(err)})`;
|
|
958
956
|
}
|
|
@@ -1017,7 +1015,7 @@ export function gitlabForge(opts) {
|
|
|
1017
1015
|
return isObject(got) && got.state === "opened";
|
|
1018
1016
|
}
|
|
1019
1017
|
catch (err) {
|
|
1020
|
-
if (err
|
|
1018
|
+
if (notFound(err))
|
|
1021
1019
|
return false;
|
|
1022
1020
|
throw err;
|
|
1023
1021
|
}
|
|
@@ -1037,13 +1035,13 @@ export function gitlabForge(opts) {
|
|
|
1037
1035
|
return mergeRequest(made) ?? { number: 0, title, body: spec.body, head: spec.head, base };
|
|
1038
1036
|
},
|
|
1039
1037
|
async findPullRequest(head) {
|
|
1040
|
-
const open = await
|
|
1038
|
+
const open = await openMrs("source", head);
|
|
1041
1039
|
return open
|
|
1042
1040
|
// A fork's merge request into this project has another source project.
|
|
1043
1041
|
.filter((m) => isObject(m) && m.source_branch === head && (m.source_project_id === undefined || m.source_project_id === m.project_id))
|
|
1044
1042
|
.map(mergeRequest)
|
|
1045
1043
|
.filter((m) => m !== undefined)
|
|
1046
|
-
.sort(
|
|
1044
|
+
.sort(byNumber)[0];
|
|
1047
1045
|
},
|
|
1048
1046
|
async scheduledRuns(q) {
|
|
1049
1047
|
// The variable the gitlab lexicon's generated Op file selects a scheduled job by.
|
|
@@ -1057,9 +1055,28 @@ export function gitlabForge(opts) {
|
|
|
1057
1055
|
const last = newestTime(pipelines.map((p) => (isObject(p) ? str(p.created_at) : undefined)));
|
|
1058
1056
|
return { ...(last ? { last } : {}), ...(ours.length === 0 ? { noSchedule: true } : {}) };
|
|
1059
1057
|
},
|
|
1058
|
+
// #4628: the open merge requests into `base`, for the stale marking a push to it runs.
|
|
1059
|
+
async openPullRequests(base) {
|
|
1060
|
+
const out = [];
|
|
1061
|
+
for (const m of await openMrs("target", base)) {
|
|
1062
|
+
if (!isObject(m))
|
|
1063
|
+
continue;
|
|
1064
|
+
const number = num(m.iid);
|
|
1065
|
+
const head = str(m.source_branch);
|
|
1066
|
+
const headSha = str(m.sha);
|
|
1067
|
+
if (number === undefined || !head || !headSha || str(m.target_branch) !== base)
|
|
1068
|
+
continue;
|
|
1069
|
+
const refs = isObject(m.diff_refs) ? m.diff_refs : undefined;
|
|
1070
|
+
const baseSha = refs ? str(refs.base_sha) : undefined;
|
|
1071
|
+
const author = isObject(m.author) ? str(m.author.username) : undefined;
|
|
1072
|
+
const fork = num(m.source_project_id) !== undefined && num(m.source_project_id) !== num(m.target_project_id);
|
|
1073
|
+
out.push({ number, head, headSha, base, ...(baseSha ? { baseSha } : {}), ...(author ? { author } : {}), fork });
|
|
1074
|
+
}
|
|
1075
|
+
return out.sort(byNumber);
|
|
1076
|
+
},
|
|
1060
1077
|
async mergeRequestJobs(branch, job) {
|
|
1061
1078
|
const out = [];
|
|
1062
|
-
const open = await
|
|
1079
|
+
const open = await openMrs("target", branch);
|
|
1063
1080
|
for (const m of open) {
|
|
1064
1081
|
if (!isObject(m))
|
|
1065
1082
|
continue;
|
|
@@ -1092,7 +1109,7 @@ export function gitlabForge(opts) {
|
|
|
1092
1109
|
got = await api.call("GET", `${notes}/${mr}`);
|
|
1093
1110
|
}
|
|
1094
1111
|
catch (err) {
|
|
1095
|
-
if (err
|
|
1112
|
+
if (notFound(err))
|
|
1096
1113
|
return undefined;
|
|
1097
1114
|
throw err;
|
|
1098
1115
|
}
|
package/dist/pr-loop.d.ts
CHANGED
|
@@ -85,6 +85,8 @@ export declare const PR_REPORT_NOT_STARTED_FLOOR = "0.124.54";
|
|
|
85
85
|
export declare const PR_REPORT_GROUPS_FLOOR = "0.124.54";
|
|
86
86
|
/** The first chant whose report can carry `lockTargets` (#4552). */
|
|
87
87
|
export declare const PR_REPORT_LOCK_TARGETS_FLOOR = "0.124.55";
|
|
88
|
+
/** The first chant whose report carries {@link PrReport.narrowed} (#4626). */
|
|
89
|
+
export declare const PR_REPORT_NARROWED_FLOOR = "0.124.56";
|
|
88
90
|
/** The first chant whose report carries {@link PrReport.crossStackEdges} (#4617). */
|
|
89
91
|
export declare const PR_REPORT_CROSS_STACK_FLOOR = "0.124.55";
|
|
90
92
|
/** The gate a pull request's apply waits on, unless the pipeline names another. */
|
|
@@ -568,6 +570,13 @@ export interface PrReport {
|
|
|
568
570
|
* {@link PR_REPORT_LOCK_TARGETS_FLOOR}.
|
|
569
571
|
*/
|
|
570
572
|
lockTargets?: string[];
|
|
573
|
+
/**
|
|
574
|
+
* Plan stage (#4626): the addresses each component's plan was narrowed to
|
|
575
|
+
* with `pr-plan --target`, from the command line or the comment, by
|
|
576
|
+
* component. The note and the status say so. Absent when nothing was
|
|
577
|
+
* narrowed. Added within contract 1 by chant {@link PR_REPORT_NARROWED_FLOOR}.
|
|
578
|
+
*/
|
|
579
|
+
narrowed?: Record<string, string[]>;
|
|
571
580
|
/**
|
|
572
581
|
* The stacks outside the workspace a member reads (#4617, a Pulumi
|
|
573
582
|
* `StackReference` no step here applies, #4547), each marked stale,
|
package/dist/pr-loop.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pr-loop.d.ts","sourceRoot":"","sources":["../src/pr-loop.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pr-loop.d.ts","sourceRoot":"","sources":["../src/pr-loop.ts"],"names":[],"mappings":"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"}
|
package/dist/pr-loop.js
CHANGED
|
@@ -84,9 +84,11 @@ export const PR_REPORT_NOT_STARTED_FLOOR = "0.124.54";
|
|
|
84
84
|
/** The first chant whose report can carry `groups`, `fallbacks`, and a member's `group` and `groupOutcome` (ws-107, #4446). */
|
|
85
85
|
export const PR_REPORT_GROUPS_FLOOR = "0.124.54";
|
|
86
86
|
/** The first chant whose report can carry `lockTargets` (#4552). */
|
|
87
|
-
export const PR_REPORT_LOCK_TARGETS_FLOOR =
|
|
87
|
+
export const PR_REPORT_LOCK_TARGETS_FLOOR = "0.124.55";
|
|
88
|
+
/** The first chant whose report carries {@link PrReport.narrowed} (#4626). */
|
|
89
|
+
export const PR_REPORT_NARROWED_FLOOR = NEXT_RELEASE;
|
|
88
90
|
/** The first chant whose report carries {@link PrReport.crossStackEdges} (#4617). */
|
|
89
|
-
export const PR_REPORT_CROSS_STACK_FLOOR =
|
|
91
|
+
export const PR_REPORT_CROSS_STACK_FLOOR = "0.124.55";
|
|
90
92
|
/** The gate a pull request's apply waits on, unless the pipeline names another. */
|
|
91
93
|
export const PR_APPLY_GATE = "pr-apply";
|
|
92
94
|
/**
|
|
@@ -548,6 +550,8 @@ export function renderPrNote(report, options = {}) {
|
|
|
548
550
|
(m.groupOutcome === "partial" ? ", applied in part" : m.groupOutcome === "no-changes" ? ", no changes" : "") +
|
|
549
551
|
(m.inputsMoved?.length ? `, inputs from ${m.inputsMoved.join(", ")} moved` : "") +
|
|
550
552
|
(placeholders.length > 0 ? `, previewed with placeholders for ${placeholders.map(code).join(", ")}` : "") +
|
|
553
|
+
// #4626: a member whose plan was narrowed says to what.
|
|
554
|
+
(report.narrowed?.[m.component] ? `, narrowed to ${report.narrowed[m.component].map(code).join(", ")}` : "") +
|
|
551
555
|
(holes.length > 0 ? `; ${holes.length > 2 ? `${holes[0]}; and ${holes.length - 1} more, listed under Holes` : holes.join("; ")}` : "");
|
|
552
556
|
// A member whose plan has holes and no entries says nothing about what
|
|
553
557
|
// it changes, so its counts are unknown, not zero (#4084).
|
|
@@ -559,6 +563,7 @@ export function renderPrNote(report, options = {}) {
|
|
|
559
563
|
out.push("", `A ${noun} whose inputs moved ${words.verbs.apply[1]} the plan it was approved with. The next run plans it against the new values.`);
|
|
560
564
|
}
|
|
561
565
|
}
|
|
566
|
+
out.push(...narrowedLines(report, words));
|
|
562
567
|
out.push(...mayAppearLines(report, options.applyWord ?? words.stages.apply));
|
|
563
568
|
const blocked = blockedLine(report.members);
|
|
564
569
|
if (blocked)
|
|
@@ -659,6 +664,18 @@ function memberDetailSections(report, room, noun) {
|
|
|
659
664
|
out.push("", `Left out to keep this note within the comment limit: the detail of ${left.map(code).join(", ")}. The report artifact carries it.`);
|
|
660
665
|
return out.length > 0 ? out.join("\n") + "\n" : "";
|
|
661
666
|
}
|
|
667
|
+
/**
|
|
668
|
+
* The note's line for a narrowed plan (#4626): which of the plan's
|
|
669
|
+
* components were narrowed and to how many addresses, and that the plan on
|
|
670
|
+
* merge is of each whole, in the product's words.
|
|
671
|
+
*/
|
|
672
|
+
function narrowedLines(report, words) {
|
|
673
|
+
const narrowed = Object.entries(report.narrowed ?? {}).filter(([, a]) => a.length > 0);
|
|
674
|
+
if (narrowed.length === 0)
|
|
675
|
+
return [];
|
|
676
|
+
const each = narrowed.map(([c, a]) => `${code(c)} to ${a.map(code).join(", ")}`).join("; ");
|
|
677
|
+
return ["", `This ${words.verbs.plan[0]} was narrowed with \`--target\`: ${each}. The approval binds the narrowed plan. On merge each ${words.noun[0]} is ${words.verbs.plan[1]} whole.`];
|
|
678
|
+
}
|
|
662
679
|
/** A commit status's description, at most 140 characters (GitHub's limit). */
|
|
663
680
|
export function prStatusDescription(report, words = activeProductWords()) {
|
|
664
681
|
const n = report.members.length;
|
|
@@ -672,7 +689,9 @@ export function prStatusDescription(report, words = activeProductWords()) {
|
|
|
672
689
|
break;
|
|
673
690
|
case "planned": {
|
|
674
691
|
const unknown = report.members.filter((m) => memberHoleReasons(report, m.member).length > 0).length;
|
|
675
|
-
|
|
692
|
+
// #4626: a narrowed plan says so in its status.
|
|
693
|
+
const narrowed = Object.values(report.narrowed ?? {}).filter((a) => a.length > 0).length;
|
|
694
|
+
text = `${many(n)}${narrowed > 0 ? ` (${narrowed} narrowed with --target)` : ""}: ${sum.change} to change, ${sum.destroy} to destroy or replace${unknown > 0 ? `, ${unknown} with holes` : ""}${digest}`;
|
|
676
695
|
break;
|
|
677
696
|
}
|
|
678
697
|
case "plan-failed":
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Auto merge after an update before merge (#4636): `pr-apply --before-merge
|
|
3
|
+
* --merge auto --merge-token-env <VAR>` merges the pull request once every
|
|
4
|
+
* member applied and the apply's records are on the ledger's remote.
|
|
5
|
+
*
|
|
6
|
+
* The merge is a second step after the apply, and never a reason to apply
|
|
7
|
+
* again:
|
|
8
|
+
*
|
|
9
|
+
* - The records come first. The apply's release records and gate facts are
|
|
10
|
+
* pushed to `chant/lifecycle`; a push that did not land leaves the pull
|
|
11
|
+
* request open with the reason posted.
|
|
12
|
+
* - The head is checked again. The pull request must still be open at the
|
|
13
|
+
* commit that applied, and the forge's merge is asked to merge only that
|
|
14
|
+
* commit, so a push after the apply is never merged unapplied.
|
|
15
|
+
* - A refusal (branch protection, a new push, a conflict, a closed pull
|
|
16
|
+
* request) is posted on the pull request in one comment the next attempt
|
|
17
|
+
* edits, and the apply stays as it was recorded.
|
|
18
|
+
* - The merge's forge client holds the token `--merge-token-env` names and
|
|
19
|
+
* no other: never the plan job's token, nor the apply job's own. On GitLab
|
|
20
|
+
* the variable is a protected one.
|
|
21
|
+
*/
|
|
22
|
+
import { type CiProductWords } from "./ci-product-words.js";
|
|
23
|
+
import type { MergeOptions, PrForge } from "./pr-forge.js";
|
|
24
|
+
/** How a pull request applied before merge gets merged. */
|
|
25
|
+
export type PrApplyMerge = "manual" | "auto";
|
|
26
|
+
export declare const PR_APPLY_MERGES: readonly PrApplyMerge[];
|
|
27
|
+
export type PrMergeMethod = NonNullable<MergeOptions["method"]>;
|
|
28
|
+
export declare const PR_MERGE_METHODS: readonly PrMergeMethod[];
|
|
29
|
+
/** The marker of the comment a refused merge posts. */
|
|
30
|
+
export declare function prMergeMarker(pr: number): string;
|
|
31
|
+
/** What {@link mergeAfterApply} did. */
|
|
32
|
+
export interface MergeAfterApply {
|
|
33
|
+
merged: boolean;
|
|
34
|
+
/** The merge commit, when the forge says. */
|
|
35
|
+
sha?: string;
|
|
36
|
+
/** Why it was not merged. */
|
|
37
|
+
reason?: string;
|
|
38
|
+
/** The refusal was posted on the pull request. */
|
|
39
|
+
posted?: boolean;
|
|
40
|
+
}
|
|
41
|
+
export interface MergeAfterApplyInput {
|
|
42
|
+
/** The client built from the merge token alone. */
|
|
43
|
+
forge: Pick<PrForge, "kind" | "mergePullRequest" | "pullRequestHead" | "upsertComment">;
|
|
44
|
+
pr: number;
|
|
45
|
+
/** The commit that applied. */
|
|
46
|
+
head: string;
|
|
47
|
+
method?: PrMergeMethod;
|
|
48
|
+
/** Whether the apply's records reached the ledger's remote, and why not. */
|
|
49
|
+
recorded: {
|
|
50
|
+
pushed: boolean;
|
|
51
|
+
warning?: string;
|
|
52
|
+
};
|
|
53
|
+
words?: CiProductWords;
|
|
54
|
+
}
|
|
55
|
+
/** Merge the pull request after its update applied. Never throws; a refusal is posted and returned. */
|
|
56
|
+
export declare function mergeAfterApply(i: MergeAfterApplyInput): Promise<MergeAfterApply>;
|
|
57
|
+
/**
|
|
58
|
+
* The environment a merge client reads its token from: the job's, with the
|
|
59
|
+
* named variable as the only token and every other forge token left out.
|
|
60
|
+
*/
|
|
61
|
+
export declare function mergeTokenEnv(tokenEnv: string, env?: Record<string, string | undefined>): Record<string, string | undefined> | {
|
|
62
|
+
error: string;
|
|
63
|
+
};
|
|
64
|
+
//# sourceMappingURL=pr-merge.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pr-merge.d.ts","sourceRoot":"","sources":["../src/pr-merge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAExD,2DAA2D;AAC3D,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE7C,eAAO,MAAM,eAAe,EAAE,SAAS,YAAY,EAAuB,CAAC;AAE3E,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;AAEhE,eAAO,MAAM,gBAAgB,EAAE,SAAS,aAAa,EAAkC,CAAC;AAExF,uDAAuD;AACvD,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wCAAwC;AACxC,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,OAAO,CAAC;IAChB,6CAA6C;IAC7C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,6BAA6B;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kDAAkD;IAClD,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC,mDAAmD;IACnD,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,eAAe,CAAC,CAAC;IACxF,EAAE,EAAE,MAAM,CAAC;IACX,+BAA+B;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,4EAA4E;IAC5E,QAAQ,EAAE;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAChD,KAAK,CAAC,EAAE,cAAc,CAAC;CACxB;AAID,uGAAuG;AACvG,wBAAsB,eAAe,CAAC,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,eAAe,CAAC,CA0BvF;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAO7J"}
|
package/dist/pr-merge.js
ADDED
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Auto merge after an update before merge (#4636): `pr-apply --before-merge
|
|
3
|
+
* --merge auto --merge-token-env <VAR>` merges the pull request once every
|
|
4
|
+
* member applied and the apply's records are on the ledger's remote.
|
|
5
|
+
*
|
|
6
|
+
* The merge is a second step after the apply, and never a reason to apply
|
|
7
|
+
* again:
|
|
8
|
+
*
|
|
9
|
+
* - The records come first. The apply's release records and gate facts are
|
|
10
|
+
* pushed to `chant/lifecycle`; a push that did not land leaves the pull
|
|
11
|
+
* request open with the reason posted.
|
|
12
|
+
* - The head is checked again. The pull request must still be open at the
|
|
13
|
+
* commit that applied, and the forge's merge is asked to merge only that
|
|
14
|
+
* commit, so a push after the apply is never merged unapplied.
|
|
15
|
+
* - A refusal (branch protection, a new push, a conflict, a closed pull
|
|
16
|
+
* request) is posted on the pull request in one comment the next attempt
|
|
17
|
+
* edits, and the apply stays as it was recorded.
|
|
18
|
+
* - The merge's forge client holds the token `--merge-token-env` names and
|
|
19
|
+
* no other: never the plan job's token, nor the apply job's own. On GitLab
|
|
20
|
+
* the variable is a protected one.
|
|
21
|
+
*/
|
|
22
|
+
import { activeProductWords } from "./ci-product-words.js";
|
|
23
|
+
export const PR_APPLY_MERGES = ["manual", "auto"];
|
|
24
|
+
export const PR_MERGE_METHODS = ["merge", "squash", "rebase"];
|
|
25
|
+
/** The marker of the comment a refused merge posts. */
|
|
26
|
+
export function prMergeMarker(pr) {
|
|
27
|
+
return `<!-- chant:merge:${pr} -->`;
|
|
28
|
+
}
|
|
29
|
+
const short = (sha) => sha.slice(0, 12);
|
|
30
|
+
/** Merge the pull request after its update applied. Never throws; a refusal is posted and returned. */
|
|
31
|
+
export async function mergeAfterApply(i) {
|
|
32
|
+
const words = i.words ?? activeProductWords();
|
|
33
|
+
const what = i.forge.kind === "gitlab" ? `Merge request !${i.pr}` : `Pull request ${i.pr}`;
|
|
34
|
+
const refuse = async (reason) => {
|
|
35
|
+
const body = `${prMergeMarker(i.pr)}\n${what} was not merged: ${reason}. The ${words.verbs.apply[0]} of ${short(i.head)} stays applied and recorded; it is never applied again to merge. Merge it by hand once the reason is gone, or ${words.verbs.apply[0]} again after a new push.\n`;
|
|
36
|
+
try {
|
|
37
|
+
await i.forge.upsertComment(i.pr, prMergeMarker(i.pr), body);
|
|
38
|
+
return { merged: false, reason, posted: true };
|
|
39
|
+
}
|
|
40
|
+
catch {
|
|
41
|
+
return { merged: false, reason, posted: false };
|
|
42
|
+
}
|
|
43
|
+
};
|
|
44
|
+
if (!i.recorded.pushed)
|
|
45
|
+
return refuse(`the ${words.verbs.apply[0]}'s records are not on the ledger's remote${i.recorded.warning ? ` (${i.recorded.warning})` : ""}`);
|
|
46
|
+
try {
|
|
47
|
+
if (i.forge.pullRequestHead) {
|
|
48
|
+
const now = await i.forge.pullRequestHead(i.pr);
|
|
49
|
+
if (!now)
|
|
50
|
+
return refuse("the forge could not say its head");
|
|
51
|
+
if (!now.open)
|
|
52
|
+
return refuse("it is no longer open");
|
|
53
|
+
if (now.sha !== i.head)
|
|
54
|
+
return refuse(`its head is ${short(now.sha)} now, not ${short(i.head)}, the commit that applied`);
|
|
55
|
+
}
|
|
56
|
+
const merged = await i.forge.mergePullRequest(i.pr, { sha: i.head, ...(i.method ? { method: i.method } : {}) });
|
|
57
|
+
if (!merged.merged)
|
|
58
|
+
return refuse(merged.reason ?? "the forge refused the merge");
|
|
59
|
+
return { merged: true, ...(merged.sha ? { sha: merged.sha } : {}) };
|
|
60
|
+
}
|
|
61
|
+
catch (err) {
|
|
62
|
+
return refuse(`the forge answered ${err instanceof Error ? err.message : String(err)}`);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* The environment a merge client reads its token from: the job's, with the
|
|
67
|
+
* named variable as the only token and every other forge token left out.
|
|
68
|
+
*/
|
|
69
|
+
export function mergeTokenEnv(tokenEnv, env = process.env) {
|
|
70
|
+
const token = env[tokenEnv]?.trim();
|
|
71
|
+
if (!token)
|
|
72
|
+
return { error: `--merge-token-env names ${tokenEnv}, which is not set in this job` };
|
|
73
|
+
const out = { ...env };
|
|
74
|
+
for (const name of ["CHANT_FORGE_TOKEN", "GITHUB_TOKEN", "GH_TOKEN", "GITLAB_TOKEN", "CI_JOB_TOKEN", "FORGEJO_TOKEN", "CHANT_GITHUB_TOKEN", "CHANT_GITLAB_TOKEN", "CHANT_FORGEJO_TOKEN"])
|
|
75
|
+
delete out[name];
|
|
76
|
+
out.CHANT_FORGE_TOKEN = token;
|
|
77
|
+
return out;
|
|
78
|
+
}
|
package/dist/pr-post.d.ts
CHANGED
|
@@ -20,6 +20,13 @@
|
|
|
20
20
|
* job there that holds `CHANT_FORGE_TOKEN` runs whatever the change wrote.
|
|
21
21
|
* `pr-post --open` ({@link postOpenPlanReports}) asks GitLab for each open
|
|
22
22
|
* merge request's plan job and reads the report from its artifacts.
|
|
23
|
+
*
|
|
24
|
+
* #4628: the note carries the target branch's commit it was posted against
|
|
25
|
+
* (`baseTip`) in a hidden line, and on GitHub and Forgejo the note job adds
|
|
26
|
+
* the note to the job summary (`GITHUB_STEP_SUMMARY`). When the target
|
|
27
|
+
* branch moves, {@link markStaleNotes}, from a job of the push, marks each
|
|
28
|
+
* open pull request's note stale with a line naming the comment that
|
|
29
|
+
* previews again, and sets its plan status back to pending.
|
|
23
30
|
*/
|
|
24
31
|
import { type PrOverdue, type PrReport } from "./pr-loop.js";
|
|
25
32
|
import { type PrForge } from "./pr-forge.js";
|
|
@@ -51,6 +58,23 @@ export interface PlanPostInput {
|
|
|
51
58
|
* from the checkout `CHANT_CONTROL_DIR` names, when it names one.
|
|
52
59
|
*/
|
|
53
60
|
controlFacts?: () => Promise<ControlEdgeFacts | undefined>;
|
|
61
|
+
/**
|
|
62
|
+
* The description check (#4629, `../ci-respond-run.ts`), run once the
|
|
63
|
+
* note is posted, on the report's change set. Its finding is a comment of
|
|
64
|
+
* its own; it never changes the status.
|
|
65
|
+
*/
|
|
66
|
+
description?: (report: PrReport) => Promise<void>;
|
|
67
|
+
/**
|
|
68
|
+
* The target branch's commit the pull request's event names (#4628): the
|
|
69
|
+
* note carries it in a hidden line, and {@link markStaleNotes} marks the
|
|
70
|
+
* note stale once the branch has moved past it. Ignored unless a full sha.
|
|
71
|
+
*/
|
|
72
|
+
baseTip?: string;
|
|
73
|
+
/**
|
|
74
|
+
* The job summary file (#4628), `GITHUB_STEP_SUMMARY` on GitHub and
|
|
75
|
+
* Forgejo: the note, without its hidden lines, is added to it.
|
|
76
|
+
*/
|
|
77
|
+
summaryFile?: string;
|
|
54
78
|
}
|
|
55
79
|
/** What {@link postPlanReport} did. */
|
|
56
80
|
export interface PlanPostResult {
|
|
@@ -76,7 +100,13 @@ export declare function readPlanReport(input: Pick<PlanPostInput, "dir" | "pr" |
|
|
|
76
100
|
* The note for `report`, rendered here, with every `<!--` after the marker
|
|
77
101
|
* line written as `<!--`, so the note carries no hidden marker but its own.
|
|
78
102
|
*/
|
|
79
|
-
export declare function planNoteFor(report: PrReport, forge: Pick<PrForge, "kind" | "host">, marker: string): string;
|
|
103
|
+
export declare function planNoteFor(report: PrReport, forge: Pick<PrForge, "kind" | "host">, marker: string, baseTip?: string): string;
|
|
104
|
+
/** The hidden line a note carries with the target branch's commit it was posted against (#4628). */
|
|
105
|
+
export declare function prNoteTipMarker(sha: string): string;
|
|
106
|
+
/** The hidden line a note marked stale carries, with the commit it was marked at (#4628). */
|
|
107
|
+
export declare function prNoteStaleMarker(sha: string): string;
|
|
108
|
+
/** The note as the job summary shows it (#4628): the hidden lines dropped. */
|
|
109
|
+
export declare function planNoteSummary(note: string): string;
|
|
80
110
|
/**
|
|
81
111
|
* Post the status and the note for the plan report under `input.dir`. A
|
|
82
112
|
* forge that refuses a call is a warning. A report that is missing or not
|
|
@@ -104,6 +134,10 @@ export interface OpenPlanPostInput {
|
|
|
104
134
|
env: string;
|
|
105
135
|
member?: string;
|
|
106
136
|
overdue?: () => Promise<PrOverdue[]>;
|
|
137
|
+
/** The description check, as {@link PlanPostInput.description}. */
|
|
138
|
+
description?: (report: PrReport) => Promise<void>;
|
|
139
|
+
/** The target branch's commit this pipeline runs at (#4628), for each note's tip line. */
|
|
140
|
+
baseTip?: string;
|
|
107
141
|
}
|
|
108
142
|
/** What {@link postOpenPlanReports} did for one merge request. */
|
|
109
143
|
export interface OpenPlanPost {
|
|
@@ -127,4 +161,39 @@ export declare function postOpenPlanReports(input: OpenPlanPostInput): Promise<{
|
|
|
127
161
|
posts: OpenPlanPost[];
|
|
128
162
|
warnings: string[];
|
|
129
163
|
}>;
|
|
164
|
+
/** What {@link markStaleNotes} marks. */
|
|
165
|
+
export interface StaleMarkInput {
|
|
166
|
+
/** A client that lists open pull requests ({@link PrForge.openPullRequests}). */
|
|
167
|
+
forge: PrForge;
|
|
168
|
+
/** The target branch that moved. */
|
|
169
|
+
branch: string;
|
|
170
|
+
/** Its commit now: the push's. */
|
|
171
|
+
tip: string;
|
|
172
|
+
env: string;
|
|
173
|
+
member?: string;
|
|
174
|
+
/** The pipeline answers the plan comment (`--preview-comment`), so the stale line names it. */
|
|
175
|
+
previewComment?: boolean;
|
|
176
|
+
words?: CiProductWords;
|
|
177
|
+
}
|
|
178
|
+
/** What {@link markStaleNotes} did for one pull request. */
|
|
179
|
+
export interface StaleMark {
|
|
180
|
+
pr: number;
|
|
181
|
+
/** Marked stale, and its status set back to pending. */
|
|
182
|
+
marked?: boolean;
|
|
183
|
+
/** Why it was left alone. */
|
|
184
|
+
skipped?: string;
|
|
185
|
+
}
|
|
186
|
+
/**
|
|
187
|
+
* Mark stale each open pull request's note into `branch` that was posted
|
|
188
|
+
* against another commit than `tip` (#4628): a line after the marker says
|
|
189
|
+
* the branch moved and names the comment that previews again (or a push,
|
|
190
|
+
* when the pipeline answers no plan comment), and the plan status on the
|
|
191
|
+
* pull request's head goes back to pending. A note with no tip line (posted
|
|
192
|
+
* before #4628), one at `tip`, or one already marked at `tip` is left alone.
|
|
193
|
+
* A forge that refuses one pull request is a warning, and the others go on.
|
|
194
|
+
*/
|
|
195
|
+
export declare function markStaleNotes(input: StaleMarkInput): Promise<{
|
|
196
|
+
marks: StaleMark[];
|
|
197
|
+
warnings: string[];
|
|
198
|
+
}>;
|
|
130
199
|
//# sourceMappingURL=pr-post.d.ts.map
|
package/dist/pr-post.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pr-post.d.ts","sourceRoot":"","sources":["../src/pr-post.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"pr-post.d.ts","sourceRoot":"","sources":["../src/pr-post.ts"],"names":[],"mappings":"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"}
|