@mutmutco/cli 3.59.0 → 3.59.1
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/main.cjs +8 -4
- package/package.json +1 -1
package/dist/main.cjs
CHANGED
|
@@ -14032,16 +14032,17 @@ async function rollDevelopmentForward(deps, ctx, tag) {
|
|
|
14032
14032
|
}
|
|
14033
14033
|
async function enqueueAlignmentAutoMerge(deps, ctx, prNumber, prUrl, openedNote) {
|
|
14034
14034
|
const base = { status: "pr-pending", prNumber, prUrl };
|
|
14035
|
-
const
|
|
14035
|
+
const retryCommand = `mmi-cli pr merge ${prNumber ?? "<number>"} --auto --merge`;
|
|
14036
|
+
const manual = `${openedNote} \u2014 land it with \`${retryCommand}\``;
|
|
14036
14037
|
if (deps.mergeAuto && prNumber !== void 0) {
|
|
14037
14038
|
try {
|
|
14038
14039
|
const res = await deps.mergeAuto(String(prNumber), ctx.repo);
|
|
14039
14040
|
if (res.mergeStatus !== "failed") {
|
|
14040
14041
|
return { ...base, autoMergeEnqueued: true, note: `${openedNote} \u2014 auto-merge enqueued (merges when checks pass)` };
|
|
14041
14042
|
}
|
|
14042
|
-
deps.warn?.(`alignment PR #${prNumber} auto-merge
|
|
14043
|
+
deps.warn?.(`alignment PR #${prNumber} auto-merge not armed (${res.error ?? "unknown error"}) \u2014 re-run: ${retryCommand}`);
|
|
14043
14044
|
} catch (e) {
|
|
14044
|
-
deps.warn?.(`alignment PR #${prNumber} auto-merge enqueue threw (${e instanceof Error ? e.message : String(e)}) \u2014
|
|
14045
|
+
deps.warn?.(`alignment PR #${prNumber} auto-merge enqueue threw (${e instanceof Error ? e.message : String(e)}) \u2014 re-run: ${retryCommand}`);
|
|
14045
14046
|
}
|
|
14046
14047
|
}
|
|
14047
14048
|
return { ...base, note: manual };
|
|
@@ -22161,7 +22162,10 @@ async function ghMergeAutoEnqueue(prNumber, repo, method, io = defaultGhMergeAut
|
|
|
22161
22162
|
if (!basePolicyBlocksImmediateMerge(message)) {
|
|
22162
22163
|
return { mergeStatus: "failed", error: ghFailureReason(e) };
|
|
22163
22164
|
}
|
|
22164
|
-
return {
|
|
22165
|
+
return {
|
|
22166
|
+
mergeStatus: "failed",
|
|
22167
|
+
error: `${ghFailureReason(e)} \u2014 auto-merge could not be armed yet (the PR's required checks have not registered); re-run the same --auto merge once they appear`
|
|
22168
|
+
};
|
|
22165
22169
|
}
|
|
22166
22170
|
return confirmEnqueueOutcome();
|
|
22167
22171
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mutmutco/cli",
|
|
3
|
-
"version": "3.59.
|
|
3
|
+
"version": "3.59.1",
|
|
4
4
|
"description": "MMI Future CLI — the org dev toolbox (board, registry, keyless secrets, release train, bootstrap, doctor) and the cross-IDE engine the plugin's session-start hook drives.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "UNLICENSED",
|