blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-05 05:12:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: solve stop when merge failed (#3106)

Browse Source
This commit is contained in:
Monet Lee 2025-02-08 15:26:35 +08:00 committed by GitHub
parent ad8829c5a6
commit 489571f4b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.github/workflows/merge-from-milestone.yml vendored
View File

@ -113,26 +113,33 @@ jobs:
echo "Cherry-picking commit: $merge_commit" echo "Cherry-picking commit: $merge_commit"
if ! git cherry-pick "$merge_commit" --strategy=recursive -X theirs; then if ! git cherry-pick "$merge_commit" --strategy=recursive -X theirs; then
echo "Cherry-pick encountered conflicts, attempting to resolve..." echo "Conflict detected for $merge_commit. Resolving with incoming changes."
git status --porcelain | grep '^UU ' | cut -c 4- | while read -r file; do conflict_files=$(git diff --name-only --diff-filter=U)
echo "Resolving conflict in $file" echo "Conflicting files:"
echo "$conflict_files"
for file in $conflict_files; do
if [ -f "$file" ]; then
echo "Resolving conflict for $file"
git add "$file" git add "$file"
done else
git status --porcelain | grep '^AA ' | cut -c 4- | while read -r file; do echo "File $file has been deleted. Skipping."
echo "Adding new file $file"
git add "$file"
done
git status --porcelain | grep '^DD ' | cut -c 4- | while read -r file; do
echo "Removing deleted file $file"
git rm "$file" git rm "$file"
fi
done done
git cherry-pick --continue || { echo "Cherry-pick failed"; continue; }
echo "Conflicts resolved. Continuing cherry-pick."
git cherry-pick --continue || { echo "Cherry-pick failed, but continuing to create PR."; }
else
echo "Cherry-pick successful for commit $merge_commit."
fi fi
git remote set-url origin "https://${BOT_TOKEN}@github.com/${{ github.repository }}.git" git remote set-url origin "https://${BOT_TOKEN}@github.com/${{ github.repository }}.git"
echo "Pushing branch: $cherry_pick_branch" echo "Pushing branch: $cherry_pick_branch"
git push origin $cherry_pick_branch --force || { echo "Push failed"; continue; } if ! git push origin $cherry_pick_branch --force; then
echo "Push failed, but continuing to create PR..."
fi
new_pr_title="$pr_title [Created by @$pr_creator from #$pr_number]" new_pr_title="$pr_title [Created by @$pr_creator from #$pr_number]"
new_pr_body="$pr_body new_pr_body="$pr_body