fix: rebase the curator clone before P3 mutation pushes

2026-08-12 18:07:41 +02:00
parent 6feb96270b
commit 3e9940b4f0
1 changed files with 4 additions and 0 deletions
@@ -714,6 +714,10 @@ async function initializeGitAndRegistry(ctx) {

 async function mutateWorkspaceDescriptor(ctx, workspaceId, mutator, commitMessage) {
  const author = join(ctx.run.root, "author");
+  // The registry may have produced docs-only follow-up commits on the remote; the curator
+  // always rebases onto the latest remote head before committing so the push stays fast-forward.
+  await git(ctx, ["fetch", "origin", "main"], { cwd: author });
+  await git(ctx, ["reset", "--hard", "origin/main"], { cwd: author });
  const workspace = structuredClone(ctx.workspaceObjects[workspaceId === "p2-dwh" ? "dwh" : "filesystem"]);
  mutator(workspace);
  ctx.workspaceObjects[workspaceId === "p2-dwh" ? "dwh" : "filesystem"] = workspace;