Merge pull request #511 from ty-dc/robot/cp-use-label-x

automatically port the label from the initial cherry-picked PR

.github/workflows/auto-cherry-pick.yaml

@@ -30,6 +30,13 @@ jobs:
         with:
           fetch-depth: 0
 
+      - uses: crazy-max/ghaction-import-gpg@v5
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+
       # ${{ secrets.GITHUB_TOKEN }} is forbidden to create or approve pull requests
       - name: cherry pick
         env:
@@ -90,25 +97,31 @@ jobs:
           #
           echo "=============================== get dest branch from labels ======== "
           WANT_MERGE_BRANCH_LIST=""
+          INITIAL_LABEL=""
           if ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.destBranch != '' }}; then
                 WANT_MERGE_BRANCH_LIST=${{ github.event.inputs.destBranch }}
           else
                 for LABEL in ${PR_LABEL} ; do
                     echo "checking label $LABEL "
                     PREFIX="${{ env.PR_LABEL_PREFIX_CHERRYPICK }}"
-                    grep -E "^${PREFIX}" <<< "${LABEL}" &>/dev/null || continue
+                    if ! grep -E "^${PREFIX}" <<< "${LABEL}" &>/dev/null; then
+                        INITIAL_LABEL+="${LABEL},"
+                        continue
+                    fi
                     BRANCH_NAME=` sed 's?'"${PREFIX}"'??' <<< "$LABEL" `
                     WANT_MERGE_BRANCH_LIST+=" $BRANCH_NAME "
                 done
           fi
           [ -z "$WANT_MERGE_BRANCH_LIST" ] && echo "no branch to cherry pick" && exit 0
           echo "cherry pick to $WANT_MERGE_BRANCH_LIST "
+          INITIAL_LABEL="${INITIAL_LABEL%,}"
+          echo "INITIAL_LABEL: ${INITIAL_LABEL}"
           #
           #
           echo "============ begin to cherry pick ============ "
           FINAL_FAILURE=false
           git branch
-          git config  user.email "[email protected]"
+          git config  user.email "[email protected]"
           git config  user.name "robot"
           gh label create ${{ env.CHERRYPICK_LABEL }} || true
           for BRANCH in $WANT_MERGE_BRANCH_LIST ; do
@@ -185,10 +198,11 @@ jobs:
               if [ "$UPDATE" == "true" ] ; then
                   echo "succeeded to cherry pick to branch $BRANCH "
                   # create a pr
+                  git commit -s -S --amend --no-edit
                   git push origin ${PR_BRANCH}:${PR_BRANCH} -f
                   gh pr create --title "${PR_TITLE}" \
                       --assignee "${PR_AUTHOR},${{ env.DEFAULT_REVIEWER }}" \
-                      --label ${{ env.CHERRYPICK_LABEL }} \
+                      --label "${{ env.CHERRYPICK_LABEL }},${INITIAL_LABEL}" \
                       --body "robot cherry pick pr <${PR_URL}> to branch ${BRANCH},  action <${ACTION_URL}>  , commits $PR_COMMITS " \
                       --base ${BRANCH}
               else

.github/workflows/call-release-changelog.yaml

@@ -131,13 +131,21 @@ jobs:
           name: changelog_artifact
           path: ${{ env.DEST_DIRECTORY }}
 
+      - uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+
       - name: Create Pull Request
         id: create_pr
         uses: peter-evans/[email protected]
         with:
           title: "robot update changelog with tag ${{ needs.generate_changelog.outputs.dest_tag }} to branch ${{ env.DEST_BRANCH }} "
           commit-message: "robot update changelog from tag ${{ needs.generate_changelog.outputs.begin_tag }} to tag ${{ needs.generate_changelog.outputs.dest_tag }} "
           branch-suffix: timestamp
+          committer: ty-dc <[email protected]>
           branch: robot/update_changelog
           delete-branch: true
           base: ${{ env.DEST_BRANCH }}

.github/workflows/call-release-chart.yaml

@@ -106,6 +106,13 @@ jobs:
           helm repo index  ./charts  --url ${url}/charts
           mv ./charts/index.yaml ./index.yaml
 
+      - uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+
       # Allow auto-merge on general
       - name: Create Pull Request
         id: create_pr
@@ -115,6 +122,7 @@ jobs:
           commit-message: "robot update chart from  ${{ needs.package.outputs.REF }} to branch ${{ env.MERGE_BRANCH }} "
           branch-suffix: timestamp
           branch: robot/update_doc
+          committer: ty-dc <[email protected]>
           delete-branch: true
           base: ${{ env.MERGE_BRANCH }}
           signoff: true

.github/workflows/call-release-pages.yaml

@@ -162,6 +162,13 @@ jobs:
           tar -xzvf site.tar.gz
           rm -f site.tar.gz
 
+      - uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+
       # Allow auto-merge on general
       - name: Create Pull Request
         id: create_pr
@@ -171,6 +178,7 @@ jobs:
           commit-message: "robot update website from  ${{ needs.package.outputs.ref }} to branch ${{ env.MERGE_BRANCH }} with tag ${{ needs.package.outputs.doc_tag }}"
           branch-suffix: timestamp
           branch: robot/update_doc
+          committer: ty-dc <[email protected]>
           delete-branch: true
           base: ${{ env.MERGE_BRANCH }}
           signoff: true