mptyl/ThothII
1
0
Fork 0
Code Issues 25 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: rebase the curator clone before P3 mutation pushes

Browse Source
This commit is contained in:
marcopan
2026-08-12 18:07:41 +02:00
parent 6feb96270b
commit 3e9940b4f0
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/scripts/p3-acceptance.mjs
+4
View File
@@ -714,6 +714,10 @@ async function initializeGitAndRegistry(ctx) {
async function mutateWorkspaceDescriptor(ctx, workspaceId, mutator, commitMessage) { async function mutateWorkspaceDescriptor(ctx, workspaceId, mutator, commitMessage) {
const author = join(ctx.run.root, "author"); 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"]); const workspace = structuredClone(ctx.workspaceObjects[workspaceId === "p2-dwh" ? "dwh" : "filesystem"]);
mutator(workspace); mutator(workspace);
ctx.workspaceObjects[workspaceId === "p2-dwh" ? "dwh" : "filesystem"] = workspace; ctx.workspaceObjects[workspaceId === "p2-dwh" ? "dwh" : "filesystem"] = workspace;