From a735679519efa778a99494a2540bd7d09937a073 Mon Sep 17 00:00:00 2001 From: Calvin Kirs Date: Tue, 29 Oct 2024 10:02:48 +0800 Subject: [PATCH] [Chore](cherry-pick-tool)Maintain a consistent coding style --- .github/workflows/auto-cherry-pick.yml | 2 +- tools/auto-pick-script.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-cherry-pick.yml b/.github/workflows/auto-cherry-pick.yml index ec8904ba34b1fe..7d97e498ba3263 100644 --- a/.github/workflows/auto-cherry-pick.yml +++ b/.github/workflows/auto-cherry-pick.yml @@ -45,7 +45,7 @@ jobs: pip install PyGithub - name: Check SHA run: | - expected_sha="a20ac395f474dfb9289e782d08daabb30f0c8f8aa6dbd13ae28507f234a78c06b72bc13babcc43a2bc61c849d27a2d5b05ee5f5d6f6edb601ae15314bee4defc" + expected_sha="80b7c6087f2a3e4f4c7f035a52e8e7b05ce00f27aa5c1bd52179df685c912447f94a96145fd3204a3958d8ed9777de5a5183b120e99e0e95bbca0366d69b0ac0" calculated_sha=$(sha512sum tools/auto-pick-script.py | awk '{ print $1 }') if [ "$calculated_sha" != "$expected_sha" ]; then echo "SHA mismatch! Expected: $expected_sha, but got: $calculated_sha" diff --git a/tools/auto-pick-script.py b/tools/auto-pick-script.py index c8431b99d2b8ec..8f5376863d3043 100644 --- a/tools/auto-pick-script.py +++ b/tools/auto-pick-script.py @@ -89,7 +89,7 @@ # Create a new PR for the cherry-picked changes new_pr = repo.create_pull( title=f"{TARGET_BRANCH}: {pr.title}", # Prefix with branch name - body=pr.body+ "\n Cherry-picked from #"+pr.number, # Keep the original PR body + body=f"PR Body: {pr.body} \n Cherry-picked from #{pr.number}", # Keep the original PR body head=new_branch_name, base=TARGET_BRANCH )