From a916904e7624275bac5af9eeaa291c38706debdf Mon Sep 17 00:00:00 2001 From: Agent Date: Fri, 3 Apr 2026 06:37:13 +0000 Subject: [PATCH] fix: correct merge_when_checks_succeed to true for auto-merge (#170) --- bin/disinto | 2 +- lib/vault.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/disinto b/bin/disinto index fa3cc37..b008ff1 100755 --- a/bin/disinto +++ b/bin/disinto @@ -2980,7 +2980,7 @@ This PR creates a vault item for the release of version ${version}. -H "Authorization: token ${FORGE_TOKEN}" \ -H "Content-Type: application/json" \ "${FORGE_URL}/api/v1/repos/${FORGE_OPS_REPO}/pulls/${pr_number}/merge" \ - -d '{"Do":"merge","merge_when_checks_succeed":false}' >/dev/null 2>&1 || { + -d '{"Do":"merge","merge_when_checks_succeed":true}' >/dev/null 2>&1 || { echo "Warning: failed to enable auto-merge (may already be enabled or not supported)" >&2 } diff --git a/lib/vault.sh b/lib/vault.sh index bd3a211..812d464 100644 --- a/lib/vault.sh +++ b/lib/vault.sh @@ -193,7 +193,7 @@ before execution. See the TOML file for details." -H "Authorization: token ${FORGE_TOKEN}" \ -H "Content-Type: application/json" \ "${ops_api}/pulls/${pr_num}/merge" \ - -d '{"Do":"merge","merge_when_checks_succeed":false}' >/dev/null 2>&1 || { + -d '{"Do":"merge","merge_when_checks_succeed":true}' >/dev/null 2>&1 || { _vault_log "Warning: failed to enable auto-merge (may already be enabled or not supported)" }