Skip to content

Commit 9babe5c

Browse files
committed
Make PR & Dependabot WFs working against support branches
(cherry picked from commit 1f4d27d) # Conflicts: # .github/workflows/merge-dependabot-pr.yml
1 parent 116284a commit 9babe5c

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Merge Dependabot PR
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
- '*.x'
8+
9+
run-name: Merge Dependabot PR ${{ github.ref_name }}
10+
11+
jobs:
12+
merge-dependabot-pr:
13+
permissions: write-all
14+
15+
uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@main
16+
with:
17+
mergeArguments: --auto --squash

.github/workflows/pr-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branches:
66
- main
7+
- '*.x'
78

89
jobs:
910
build-pull-request:

0 commit comments

Comments
 (0)