mirror of
https://github.com/openimsdk/open-im-server.git
synced 2025-06-26 14:19:38 +08:00
Merge branch 'openimsdk:main' into fix/webhook-attentionID
This commit is contained in:
commit
220cc70ddd
16
.github/workflows/merge-from-milestone.yml
vendored
16
.github/workflows/merge-from-milestone.yml
vendored
@ -155,6 +155,17 @@ jobs:
|
|||||||
'{title: $title, head: $head, base: $base, body: $body}')")
|
'{title: $title, head: $head, base: $base, body: $body}')")
|
||||||
|
|
||||||
new_pr_number=$(echo "$response" | jq -r '.number')
|
new_pr_number=$(echo "$response" | jq -r '.number')
|
||||||
|
|
||||||
|
if [[ "$new_pr_number" == "null" || -z "$new_pr_number" ]]; then
|
||||||
|
echo "Failed to create PR. Response: $response"
|
||||||
|
|
||||||
|
git checkout $TARGET_BRANCH
|
||||||
|
|
||||||
|
git branch -D $cherry_pick_branch
|
||||||
|
|
||||||
|
echo "Deleted branch: $cherry_pick_branch"
|
||||||
|
git push origin --delete $cherry_pick_branch
|
||||||
|
else
|
||||||
echo "Created PR #$new_pr_number"
|
echo "Created PR #$new_pr_number"
|
||||||
|
|
||||||
curl -s -X POST -H "Authorization: token $GITHUB_TOKEN" \
|
curl -s -X POST -H "Authorization: token $GITHUB_TOKEN" \
|
||||||
@ -162,4 +173,9 @@ jobs:
|
|||||||
-d '{"labels": ["milestone-merge"]}' \
|
-d '{"labels": ["milestone-merge"]}' \
|
||||||
"https://api.github.com/repos/${{ github.repository }}/issues/$new_pr_number/labels"
|
"https://api.github.com/repos/${{ github.repository }}/issues/$new_pr_number/labels"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "----------------------------------------"
|
||||||
|
echo ""
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
Loading…
x
Reference in New Issue
Block a user