Skip to content
Merged
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions .github/workflows/pr_cherrypick_prestep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
while read label
do
echo label: $label
if [[ "$label" == "Approved for $branch branch" ]];then
if [[ "$label" == "Request for $branch branch" ]];then
create_pr=1
fi
if [[ "$label" == "Created PR to $branch branch" ]];then
Expand All @@ -85,7 +85,7 @@ jobs:
done <<< "$labels"

if [[ "$create_pr" != "1" ]];then
echo "Didn't find 'Approved for $branch branch' tag."
echo "Didn't find 'Request for $branch branch' tag."
return 0
fi
# Begin to cherry-pick PR
Expand All @@ -103,7 +103,7 @@ jobs:
gh pr edit $pr_url --add-label "Cherry Pick Conflict_$branch"
echo 'Add label "Cherry Pick Conflict_$branch" success'
gh pr comment $pr_url --body "@${author} PR conflicts with $branch branch"
echo 'Add commnet "@${author} PR conflicts with $branch branch"'
echo 'Add comment "@${author} PR conflicts with $branch branch"'
else
# Create PR to release branch
git push mssonicbld HEAD:cherry/$branch/${pr_id} -f
Expand Down Expand Up @@ -135,4 +135,3 @@ jobs:
echo Begin to parse Branch: $branch
cherry_pick
done