diff --git a/.gitea/actions/curio-source/main.mjs b/.gitea/actions/curio-source/main.mjs index 0ae99a8..048154f 100644 --- a/.gitea/actions/curio-source/main.mjs +++ b/.gitea/actions/curio-source/main.mjs @@ -571,13 +571,6 @@ async function validatePullRequest() { console.log(`Validated ${plan.additions.length} release(s).${reviewRequired ? " First-time third-party publication requires review." : " Provenance permits automatic merge."}`); await output("review_required", reviewRequired); await output("release_count", plan.additions.length); - if (!reviewRequired && plan.additions.length) { - await client.api(`${route}/pulls/${pullNumber}/merge`, { - method: "POST", - body: { do: "merge", merge_when_checks_succeed: true, delete_branch_after_merge: true } - }); - console.log("Scheduled merge after required checks succeed."); - } } async function verifyPublishedRelease(client, repository, tag, registry) { const release = await client.api(`/repos/${repositoryPath(repository)}/releases/tags/${encodeURIComponent(tag)}`); @@ -667,7 +660,12 @@ async function proposeRelease() { } }); } + await catalogClient.api(`${route}/pulls/${pull.number ?? pull.index}/merge`, { + method: "POST", + body: { do: "merge", merge_when_checks_succeed: true, delete_branch_after_merge: true } + }); console.log(`Release proposal: ${pull.html_url}`); + console.log("Scheduled merge after required checks succeed."); await output("pull_request", pull.html_url); } async function runAction() {