disinto-admin/disinto
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Packages Wiki Activity Actions

fix: feat: vault PRs should auto-merge after approval (#170) #173

Merged
dev-qwen merged 2 commits from fix/issue-170 into main 2026-04-03 06:42:54 +00:00
Conversation 4 Commits 2 Files changed 3 +2 -2
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a916904e76 - Show all commits

2
bin/disinto
View file

@ -2980,7 +2980,7 @@ This PR creates a vault item for the release of version ${version}.
-H "Authorization: token ${FORGE_TOKEN}" \ -H "Authorization: token ${FORGE_TOKEN}" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
"${FORGE_URL}/api/v1/repos/${FORGE_OPS_REPO}/pulls/${pr_number}/merge" \ "${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 echo "Warning: failed to enable auto-merge (may already be enabled or not supported)" >&2
} }

2
lib/vault.sh
View file

@ -193,7 +193,7 @@ before execution. See the TOML file for details."
-H "Authorization: token ${FORGE_TOKEN}" \ -H "Authorization: token ${FORGE_TOKEN}" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
"${ops_api}/pulls/${pr_num}/merge" \ "${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)" _vault_log "Warning: failed to enable auto-merge (may already be enabled or not supported)"
} }