Skip to content

Commit

Permalink
Added dependabot automerge and updated dependabot
Browse files Browse the repository at this point in the history
with this change we're moving to daily dependabot PR merges with automerge

fixes gh-5874
  • Loading branch information
marcingrzejszczak committed Feb 3, 2025
1 parent c3064d1 commit 905bb98
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 28 deletions.
56 changes: 28 additions & 28 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,32 @@ version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
target-branch: "1.9.x" # oldest supported branch
target-branch: "main"
schedule:
interval: "weekly"
# - package-ecosystem: gradle
# directory: "/"
# schedule:
# interval: monthly
# target-branch: "1.9.x"
# milestone: 136
# ignore:
# # metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
# # in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
# # <=1.5.11 or 1.5.18 doesn't break with Micrometer, but open metrics won't be correct necessarily.
# - dependency-name: "com.netflix.hystrix:hystrix-core"
# # only upgrade patch versions
# - dependency-name: "*"
# update-types:
# - version-update:semver-major
# - version-update:semver-minor
# open-pull-requests-limit: 30
- package-ecosystem: gradle
directory: "/"
schedule:
interval: monthly
target-branch: "1.9.x"
milestone: 136
ignore:
# metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
# in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
# <=1.5.11 or 1.5.18 doesn't break with Micrometer, but open metrics won't be correct necessarily.
- dependency-name: "com.netflix.hystrix:hystrix-core"
# only upgrade patch versions
- dependency-name: "*"
update-types:
- version-update:semver-major
- version-update:semver-minor
open-pull-requests-limit: 15
- package-ecosystem: gradle
directory: "/"
schedule:
interval: monthly
target-branch: "1.11.x"
milestone: 206
interval: daily
target-branch: "1.13.x"
milestone: 233
ignore:
# metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
# in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
Expand All @@ -38,13 +38,13 @@ updates:
update-types:
- version-update:semver-major
- version-update:semver-minor
open-pull-requests-limit: 15
open-pull-requests-limit: 30
- package-ecosystem: gradle
directory: "/"
schedule:
interval: monthly
target-branch: "1.12.x"
milestone: 211
interval: daily
target-branch: "1.14.x"
milestone: 250
ignore:
# metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
# in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
Expand All @@ -55,11 +55,11 @@ updates:
update-types:
- version-update:semver-major
- version-update:semver-minor
open-pull-requests-limit: 15
open-pull-requests-limit: 30
- package-ecosystem: gradle
directory: "/"
schedule:
interval: monthly
interval: daily
target-branch: "main"
milestone: 185
ignore:
Expand All @@ -71,4 +71,4 @@ updates:
- dependency-name: "*"
update-types:
- version-update:semver-major
open-pull-requests-limit: 25
open-pull-requests-limit: 50
18 changes: 18 additions & 0 deletions .github/workflows/dependabot-automerge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Merge Dependabot PR

on:
pull_request:
branches:
- main
- '*.x'

run-name: Merge Dependabot PR ${{ github.ref_name }}

jobs:
merge-dependabot-pr:
permissions: write-all

uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@v5
with:
mergeArguments: --auto --squash
autoMergeSnapshots: true

0 comments on commit 905bb98

Please sign in to comment.