sudoxreboot/fdroiddata
1
0
Fork 0
mirror of https://github.com/sudoxnym/fdroiddata.git synced 2026-05-18 11:49:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix tools/auto-merge.sh

Browse source
This commit is contained in:
linsui 2025-09-18 05:48:35 +00:00
parent eecf0aa3f3
commit 444a212b11
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tools/auto-merge.sh
View file

@ -15,11 +15,24 @@ function retry {
echo $output
}
echo "Rebasing..."
retry $glab mr rebase $mr --skip-ci
echo "Merging..."
retry $glab mr merge $mr --auto-merge=false --rebase --yes
while status=$(glab api projects/:id/merge_requests/$mr | jq -r '.detailed_merge_status'); do
if [[ $status = "approvals_syncing" || $status = "checking" ]]; then
continue
elif [[ $status = "need_rebase" ]]; then
echo "Rebasing..."
retry $glab mr rebase $mr --skip-ci
elif [[ $status = "mergeable" ]]; then
glab api --method PUT projects/:id/merge_requests/$mr/merge 2>&1 > /dev/null
if [[ $? = 0 ]]; then
break
fi
else
echo "Failed to merge $mr: $status"
exit 0
fi
done
echo "Canceling pipelines..."
merged_commit=$(retry $glab mr view $mr -F json | jq -r 'if .squash then .squash_commit_sha else .sha end')
head_pipelines=$(retry $glab ci list -F json | jq -r 'map(select(.sha == "'$merged_commit'" and (.source == "push" or .source == "merge_request_event")) | .id)[]')