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`**
spring-cloud · Dec 23, 2024 · e6e2a0d · e6e2a0d
1 parent 94f2323
commit e6e2a0d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/.github/workflows/auto-cherry-pick.yml 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 }}
diff --git a/.github/workflows/backport-issue.yml 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 }}
diff --git 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
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - '*.x'
 
 jobs:
   build-pull-request:
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ on: @@
       pull_request:
         branches:
           - main
+          - '*.x'
     run-name: Merge Dependabot PR ${{ github.ref_name }}
@@ Expand Down @@