Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: improve workflows contents. [Created by @mo3et from #3082] #3114

Closed
wants to merge 1 commit into from
Closed

build: improve workflows contents. [Created by @mo3et from #3082] #3114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions .github/workflows/merge-from-milestone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,26 +113,14 @@ jobs:

echo "Cherry-picking commit: $merge_commit"
if ! git cherry-pick "$merge_commit" --strategy=recursive -X theirs; then
echo "Cherry-pick encountered conflicts, attempting to resolve..."
git status --porcelain | grep '^UU ' | cut -c 4- | while read -r file; do
echo "Resolving conflict in $file"
git add "$file"
done
git status --porcelain | grep '^AA ' | cut -c 4- | while read -r file; do
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"
done
git cherry-pick --continue || { echo "Cherry-pick failed"; continue; }
echo "Cherry-pick encountered conflicts, attempting to continue..."
git cherry-pick --continue || { echo "Cherry-pick failed"; exit 1; }
fi

git remote set-url origin "https://${BOT_TOKEN}@github.com/${{ github.repository }}.git"

echo "Pushing branch: $cherry_pick_branch"
git push origin $cherry_pick_branch --force || { echo "Push failed"; continue; }
git push origin $cherry_pick_branch --force || { echo "Push failed"; exit 1; }

new_pr_title="$pr_title [Created by @$pr_creator from #$pr_number]"
new_pr_body="$pr_body
Expand Down
Loading