[incubator-devlake] 01/01: refactor: remove extra action

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mintsweet pushed a commit to branch fix-auto-cherry-pick
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git

commit 3c5b901628f32bdf7c57e0726bc4372955330ec3
Author: mintsweet <0x...@gmail.com>
AuthorDate: Mon Aug 7 15:53:52 2023 +1200

    refactor: remove extra action
---
 .github/actions/auto-cherry-pick/action.yml     | 3 +--
 .github/actions/auto-cherry-pick/cherry-pick.sh | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/actions/auto-cherry-pick/action.yml b/.github/actions/auto-cherry-pick/action.yml
index 095472784..9874ae1fd 100644
--- a/.github/actions/auto-cherry-pick/action.yml
+++ b/.github/actions/auto-cherry-pick/action.yml
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-name: "Auto Cherrry Pick"
+name: "Auto Cherry Pick"
 description: "cherry pick commits from Pull Requests into Release branch"
 inputs:
   author_email:
@@ -39,7 +39,6 @@ runs:
       shell: bash
       env:
         GH_TOKEN: ${{ github.token }}
-        REPOSITORY: ${{ github.repository }}
         PR_NUMBER: ${{ github.event.pull_request.number }}
         PR_TITLE: ${{ github.event.pull_request.title }}
         LABEL_NAME: ${{ github.event.label.name }}
diff --git a/.github/actions/auto-cherry-pick/cherry-pick.sh b/.github/actions/auto-cherry-pick/cherry-pick.sh
index a58afb197..484bd7e37 100644
--- a/.github/actions/auto-cherry-pick/cherry-pick.sh
+++ b/.github/actions/auto-cherry-pick/cherry-pick.sh
@@ -27,7 +27,6 @@ AUTO_CHERRY_PICK_FAILED_LABEL="bot/auto-cherry-pick-failed"
 AUTO_CHERRY_PICK_COMPLETED_LABEL="bot/auto-cherry-pick-completed"
 
 echo "::group::Basic Info"
-echo "Repository: $REPOSITORY"
 echo "PR Number: $PR_NUMBER"
 echo "PR Title: $PR_TITLE"
 echo "Label: $LABEL_NAME"
@@ -45,9 +44,8 @@ git config --global user.name "$AUTHOR_NAME"
 
 git remote update
 git fetch --all
-git restore .
 git checkout -b $PR_BRANCH origin/$TARGET_BRANCH
-git cherry-pick -m 1 --strategy=recursive --strategy-option=theirs $GITHUB_SHA || (
+git cherry-pick $GITHUB_SHA || (
 	gh pr comment $PR_NUMBER --body "🤖 The current file has a conflict, and the pr cannot be automatically created."
 	gh pr edit $PR_NUMBEr --add-label $AUTO_CHERRY_PICK_FAILED_LABEL
 	exit 1