From 8fab038fa812c1c65c7d3a7a7de34bc7d28e2e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20Burzy=C5=84ski?= <czeslavo@gmail.com>
Date: Fri, 24 Jan 2025 09:35:36 +0100
Subject: [PATCH] chore(ci): avoid infinite release-bot loop by amending commit
 msg (#1082)

---
 .github/workflows/release-bot.yaml | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-bot.yaml b/.github/workflows/release-bot.yaml
index 3782ed45b..9a76844e4 100644
--- a/.github/workflows/release-bot.yaml
+++ b/.github/workflows/release-bot.yaml
@@ -141,12 +141,31 @@ jobs:
       - publish-release
       - semver
     if: ${{ needs.look_for_release.outputs.release_found == 'true' && needs.semver.outputs.patch != '0' && needs.semver.outputs.prerelease == '' && needs.look_for_release.outputs.release_latest == 'true' && github.ref_name != 'main' }}
+    env:
+      CHERRYPICK_BRANCH: cherry-pick/${{ github.sha }}-to-main
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          fetch-depth: 0
+
+      - name: Configure git user
+        run: |
+          git config --global user.name "Kong's Team k8s bot"
+          git config --global user.email "team-k8s+github-bot@konghq.com"
 
-      - uses: carloscastrojumo/github-cherry-pick-action@503773289f4a459069c832dc628826685b75b4b3 # v1.0.10
+      - name: Cherry-pick commit
+        run: |
+          git checkout -b ${{ env.CHERRYPICK_BRANCH }} main
+          git cherry-pick ${{ github.sha }}
+          # Amend the commit message to avoid infinite loop of this workflow (it's triggered by the commit message).
+          git commit --amend -m "chore: cherry-pick ${{ needs.semver.outputs.version }} commit (${{ github.sha }}) onto main"
+
+      - uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.6
         with:
-          branch: main
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: ${{ env.CHERRYPICK_BRANCH }}
+          base: main
+          delete-branch: true
           title: '[cherry-pick] ${{ needs.semver.outputs.version }} - ${{ github.sha }}'
           body: 'Cherry picking ${{ needs.semver.outputs.version }} commit (${{ github.sha }}) onto main'