Skip to content

Commit 905bb98

Browse files
Added dependabot automerge and updated dependabot
with this change we're moving to daily dependabot PR merges with automerge fixes gh-5874
1 parent c3064d1 commit 905bb98

File tree

2 files changed

+46
-28
lines changed

2 files changed

+46
-28
lines changed

.github/dependabot.yml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@ version: 2
22
updates:
33
- package-ecosystem: "github-actions"
44
directory: "/"
5-
target-branch: "1.9.x" # oldest supported branch
5+
target-branch: "main"
66
schedule:
77
interval: "weekly"
8+
# - package-ecosystem: gradle
9+
# directory: "/"
10+
# schedule:
11+
# interval: monthly
12+
# target-branch: "1.9.x"
13+
# milestone: 136
14+
# ignore:
15+
# # metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
16+
# # in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
17+
# # <=1.5.11 or 1.5.18 doesn't break with Micrometer, but open metrics won't be correct necessarily.
18+
# - dependency-name: "com.netflix.hystrix:hystrix-core"
19+
# # only upgrade patch versions
20+
# - dependency-name: "*"
21+
# update-types:
22+
# - version-update:semver-major
23+
# - version-update:semver-minor
24+
# open-pull-requests-limit: 30
825
- package-ecosystem: gradle
926
directory: "/"
1027
schedule:
11-
interval: monthly
12-
target-branch: "1.9.x"
13-
milestone: 136
14-
ignore:
15-
# metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
16-
# in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
17-
# <=1.5.11 or 1.5.18 doesn't break with Micrometer, but open metrics won't be correct necessarily.
18-
- dependency-name: "com.netflix.hystrix:hystrix-core"
19-
# only upgrade patch versions
20-
- dependency-name: "*"
21-
update-types:
22-
- version-update:semver-major
23-
- version-update:semver-minor
24-
open-pull-requests-limit: 15
25-
- package-ecosystem: gradle
26-
directory: "/"
27-
schedule:
28-
interval: monthly
29-
target-branch: "1.11.x"
30-
milestone: 206
28+
interval: daily
29+
target-branch: "1.13.x"
30+
milestone: 233
3131
ignore:
3232
# metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
3333
# in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
@@ -38,13 +38,13 @@ updates:
3838
update-types:
3939
- version-update:semver-major
4040
- version-update:semver-minor
41-
open-pull-requests-limit: 15
41+
open-pull-requests-limit: 30
4242
- package-ecosystem: gradle
4343
directory: "/"
4444
schedule:
45-
interval: monthly
46-
target-branch: "1.12.x"
47-
milestone: 211
45+
interval: daily
46+
target-branch: "1.14.x"
47+
milestone: 250
4848
ignore:
4949
# metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
5050
# in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
@@ -55,11 +55,11 @@ updates:
5555
update-types:
5656
- version-update:semver-major
5757
- version-update:semver-minor
58-
open-pull-requests-limit: 15
58+
open-pull-requests-limit: 30
5959
- package-ecosystem: gradle
6060
directory: "/"
6161
schedule:
62-
interval: monthly
62+
interval: daily
6363
target-branch: "main"
6464
milestone: 185
6565
ignore:
@@ -71,4 +71,4 @@ updates:
7171
- dependency-name: "*"
7272
update-types:
7373
- version-update:semver-major
74-
open-pull-requests-limit: 25
74+
open-pull-requests-limit: 50
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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@v5
16+
with:
17+
mergeArguments: --auto --squash
18+
autoMergeSnapshots: true

0 commit comments

Comments
 (0)