From 954733fce71098b41e08bf4217503862785d2a51 Mon Sep 17 00:00:00 2001
From: Madelen Andersson <madelen.andersson@axis.com>
Date: Tue, 2 Apr 2024 09:23:53 +0200
Subject: [PATCH] Added workflow for cherry-picking (#69)

Co-authored-by: madelen-at-work <madelen-at-work@users.noreply.github.com>
---
 .github/workflows/cherry-picker.yml | 47 +++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 .github/workflows/cherry-picker.yml

diff --git a/.github/workflows/cherry-picker.yml b/.github/workflows/cherry-picker.yml
new file mode 100644
index 0000000..9a0c68a
--- /dev/null
+++ b/.github/workflows/cherry-picker.yml
@@ -0,0 +1,47 @@
+# yamllint disable rule:line-length
+---
+name: Cherry-pick and create PR
+
+# Workflow action that cherry-picks from the main branch on docker-acap
+# and creates a PR.
+
+on: workflow_dispatch
+
+jobs:
+  create-pr:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: create pr of cherry-pick
+        run: |
+          pr_branch="cherrybot-${RANDOM}"
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+
+          git switch -c $pr_branch
+          git remote add other $OTHER_REPO_FULL.git -f --no-tags -t main -m main
+
+          commit_hash="$(git rev-parse refs/remotes/other/HEAD)"
+          git cherry-pick $commit_hash --strategy-option theirs
+
+          remote_pr_id=$(gawk 'match($0, /\(#([0-9]+)\)$/, ary) {print ary[1]}' <<< $(git show -s --format=%s))
+          trimmed_commit_msg="$(sed -E '1 s/ \(#[0-9]+\)$//' <<< $(git show -s --format=%B))"
+          git commit --amend -m "$trimmed_commit_msg" 
+
+          title_txt="$(git show -s --format=%s)"
+          echo "title text is $title_txt"
+
+          remote_pr_body="$(gh pr view $remote_pr_id --repo $OTHER_REPO_FULL.git --json body --jq '.body')"  
+          body_text="This is an automatic cherry-pick of [$commit_hash]($OTHER_REPO_FULL/commit/$commit_hash)
+
+          The original PR was [#$remote_pr_id]($OTHER_REPO_FULL/pull/$remote_pr_id) with message:
+
+          $remote_pr_body"
+          echo "body text is $body_text"
+
+          git push --set-upstream origin $pr_branch
+          gh pr create --title "$title_txt" --body "$body_text" --base main --repo $THIS_REPO
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          THIS_REPO: "AxisCommunications/docker-compose-acap"
+          OTHER_REPO_FULL: "https://github.com/AxisCommunications/docker-acap"