yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'update-clan-core-for-checks: retry merge after delay' (#3620) from ci-fixes into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3620
This commit is contained in:
Mic92
2025-05-13 11:54:43 +00:00
parent 0f9ebeba58 48bf2ac3bc
commit 76d215540a
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitea/workflows/update-clan-core-for-checks.yml
View File

@@ -34,7 +34,8 @@ jobs:
pr_number=$(echo "$resp" | jq -r '.number') pr_number=$(echo "$resp" | jq -r '.number')
# Merge when succeed # Merge when succeed
nix run --inputs-from . nixpkgs#curl -- -X POST \ while true; do
resp=$(nix run --inputs-from . nixpkgs#curl -- -X POST \
-H "Authorization: token $CI_BOT_TOKEN" \ -H "Authorization: token $CI_BOT_TOKEN" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-d '{ -d '{
@@ -42,4 +43,11 @@ jobs:
"merge_when_checks_succeed": true, "merge_when_checks_succeed": true,
"delete_branch_after_merge": true "delete_branch_after_merge": true
}' \ }' \
"https://git.clan.lol/api/v1/repos/clan/clan-core/pulls/$pr_number/merge" "https://git.clan.lol/api/v1/repos/clan/clan-core/pulls/$pr_number/merge")
msg=$(echo $resp | jq -r '.message')
if [[ "$msg" != "Please try again later" ]]; then
break
fi
echo "Retrying in 2 seconds..."
sleep 2
done