This is an automated email from the ASF dual-hosted git repository.
mintsweet pushed a commit to branch fix-5806
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit f9b6997eb0eab2c60448753ba162b737d111015e
Author: mintsweet <0x1304...@gmail.com>
AuthorDate: Mon Aug 7 14:34:07 2023 +1200
test: auto cherry pick
---
.github/actions/auto-cherry-pick/cherry-pick.sh | 3 +--
.github/workflows/auto-cherry-pick.yml | 5 +++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/actions/auto-cherry-pick/cherry-pick.sh
b/.github/actions/auto-cherry-pick/cherry-pick.sh
index a58afb197..575477a64 100644
--- a/.github/actions/auto-cherry-pick/cherry-pick.sh
+++ b/.github/actions/auto-cherry-pick/cherry-pick.sh
@@ -45,9 +45,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
diff --git a/.github/workflows/auto-cherry-pick.yml
b/.github/workflows/auto-cherry-pick.yml
index b9957a49a..803e06b29 100644
--- a/.github/workflows/auto-cherry-pick.yml
+++ b/.github/workflows/auto-cherry-pick.yml
@@ -21,11 +21,12 @@ on:
pull_request:
types:
- labeled
- - closed
+ # - closed
jobs:
auto-cherry-pick:
- if: github.event.pull_request.merged == true &&
startsWith(github.event.label.name, 'needs-cherrypick-')
+ # if: github.event.pull_request.merged == true &&
startsWith(github.event.label.name, 'needs-cherrypick-')
+ if: startsWith(github.event.label.name, 'needs-cherrypick-')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
