From e6e2a0d1d4a691a5e8363d2385f0c8154ada72c5 Mon Sep 17 00:00:00 2001
From: Artem Bilan <artem.bilan@broadcom.com>
Date: Mon, 23 Dec 2024 10:34:33 -0500
Subject: [PATCH] Adjust GHA workflows for branching

* Add `*.x` branch pattern to `merge-dependabot-pr.yml` and `pr-build.yml`
* Add `auto-cherry-pick.yml` and `backport-issue.yml` workflows

**Auto-cherry-pick to `5.0.x`**
---
 .github/workflows/auto-cherry-pick.yml    | 13 +++++++++++++
 .github/workflows/backport-issue.yml      | 12 ++++++++++++
 .github/workflows/merge-dependabot-pr.yml |  1 +
 .github/workflows/pr-build.yml            |  1 +
 4 files changed, 27 insertions(+)
 create mode 100644 .github/workflows/auto-cherry-pick.yml
 create mode 100644 .github/workflows/backport-issue.yml

diff --git a/.github/workflows/auto-cherry-pick.yml b/.github/workflows/auto-cherry-pick.yml
new file mode 100644
index 00000000..6ba14dde
--- /dev/null
+++ b/.github/workflows/auto-cherry-pick.yml
@@ -0,0 +1,13 @@
+name: Auto Cherry-Pick
+
+on:
+  push:
+    branches:
+      - main
+      - '*.x'
+
+jobs:
+  cherry-pick-commit:
+    uses: spring-io/spring-github-workflows/.github/workflows/spring-cherry-pick.yml@v5
+    secrets:
+      GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/backport-issue.yml b/.github/workflows/backport-issue.yml
new file mode 100644
index 00000000..71e42771
--- /dev/null
+++ b/.github/workflows/backport-issue.yml
@@ -0,0 +1,12 @@
+name: Backport Issue
+
+on:
+  push:
+    branches:
+      - '*.x'
+
+jobs:
+  backport-issue:
+    uses: spring-io/spring-github-workflows/.github/workflows/spring-backport-issue.yml@v5
+    secrets:
+      GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/merge-dependabot-pr.yml b/.github/workflows/merge-dependabot-pr.yml
index a0b8737c..3673a54a 100644
--- a/.github/workflows/merge-dependabot-pr.yml
+++ b/.github/workflows/merge-dependabot-pr.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - '*.x'
 
 run-name: Merge Dependabot PR ${{ github.ref_name }}
 
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index 23947ec5..c9f71e8b 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - '*.x'
 
 jobs:
   build-pull-request: