Skip to content

Commit 8619363

Browse files
authored
Add support for auto-merging dependabot updates (#151)
* Add support for auto-merging dependabot updates * add cooldown for github actions ecosystem * exclude grafana dependencies from cooldown
1 parent 30bd4b2 commit 8619363

File tree

4 files changed

+46
-44
lines changed

4 files changed

+46
-44
lines changed

.github/dependabot.yml

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,45 @@
1-
# To get started with Dependabot version updates, you'll need to specify which
2-
# package ecosystems to update and where the package manifests are located.
3-
# Please see the documentation for all configuration options:
4-
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5-
61
version: 2
72
updates:
83
- package-ecosystem: 'github-actions'
94
directory: '/'
105
schedule:
11-
interval: 'weekly'
12-
groups:
13-
all-dependencies:
14-
patterns:
15-
- '*'
6+
interval: 'daily'
7+
cooldown:
8+
default-days: 7
9+
exclude:
10+
- 'grafana/*'
1611
- package-ecosystem: 'npm'
1712
directory: '/'
1813
schedule:
19-
interval: 'weekly'
20-
ignore:
21-
- dependency-name: 'react'
22-
update-types: ["version-update:semver-major"]
23-
- dependency-name: 'react-dom'
24-
update-types: ["version-update:semver-major"]
14+
interval: 'daily'
15+
cooldown:
16+
semver-major-days: 30
17+
semver-minor-days: 14
18+
semver-patch-days: 7
19+
exclude:
20+
- '@grafana/*'
2521
groups:
26-
all-dependencies:
22+
grafana-dependencies:
2723
patterns:
28-
- '*'
24+
- '@grafana/data'
25+
- '@grafana/runtime'
26+
- '@grafana/schema'
27+
- '@grafana/ui'
28+
29+
# Ignore dependencies that need to be updated manually for compatibility reasons
30+
ignore:
31+
# Keep @types/node in sync with the node version in .nvmrc
32+
- dependency-name: '@types/node'
33+
update-types: ['version-update:semver-major']
34+
# Keep react and react-dom on the same major version used by Grafana
35+
- dependency-name: react
36+
update-types: ['version-update:semver-major']
37+
- dependency-name: react-dom
38+
update-types: ['version-update:semver-major']
39+
# Keep react-router-dom and react-router-dom-v5-compat on the same compatible major version used by Grafana
40+
- dependency-name: react-router-dom
41+
update-types: ['version-update:semver-major']
42+
- dependency-name: react-router-dom-v5-compat
43+
update-types: ['version-update:semver-major']
44+
# Keep rxjs in sync with the version used by `@grafana/*` packages
45+
- dependency-name: rxjs
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Dependabot reviewer
2+
on: pull_request
3+
permissions:
4+
pull-requests: write
5+
contents: write
6+
jobs:
7+
call-workflow-passing-data:
8+
uses: grafana/security-github-actions/.github/workflows/dependabot-automerge.yaml@main
9+
with:
10+
packages-minor-autoupdate: '["@grafana/async-query-data","@grafana/plugin-ui"]'
11+
repository-merge-method: 'squash'

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
"prettier": "^3.4.2",
7070
"react": "18.3.1",
7171
"react-dom": "18.3.1",
72-
"react-router-dom": "^7.1.1",
7372
"react-select-event": "^5.5.1",
7473
"rimraf": "^6.0.1",
7574
"rollup": "4.41.0",

yarn.lock

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3443,11 +3443,6 @@ convert-source-map@^2.0.0:
34433443
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
34443444
integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
34453445

3446-
cookie@^1.0.1:
3447-
version "1.0.2"
3448-
resolved "https://registry.yarnpkg.com/cookie/-/cookie-1.0.2.tgz#27360701532116bd3f1f9416929d176afe1e4610"
3449-
integrity sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==
3450-
34513446
copy-to-clipboard@^3.3.1:
34523447
version "3.3.3"
34533448
resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0"
@@ -7543,13 +7538,6 @@ [email protected]:
75437538
tiny-invariant "^1.0.2"
75447539
tiny-warning "^1.0.0"
75457540

7546-
react-router-dom@^7.1.1:
7547-
version "7.6.0"
7548-
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-7.6.0.tgz#eadcede43856dc714fa3572a946fd7502775c017"
7549-
integrity sha512-DYgm6RDEuKdopSyGOWZGtDfSm7Aofb8CCzgkliTjtu/eDuB0gcsv6qdFhhi8HdtmA+KHkt5MfZ5K2PdzjugYsA==
7550-
dependencies:
7551-
react-router "7.6.0"
7552-
75537541
75547542
version "5.3.4"
75557543
resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.3.4.tgz#8ca252d70fcc37841e31473c7a151cf777887bb5"
@@ -7572,14 +7560,6 @@ [email protected]:
75727560
dependencies:
75737561
"@remix-run/router" "1.21.0"
75747562

7575-
7576-
version "7.6.0"
7577-
resolved "https://registry.yarnpkg.com/react-router/-/react-router-7.6.0.tgz#e2d0872d7bea8df79465a8bba9a20c87c32ce995"
7578-
integrity sha512-GGufuHIVCJDbnIAXP3P9Sxzq3UUsddG3rrI3ut1q6m0FI6vxVBF3JoPQ38+W/blslLH4a5Yutp8drkEpXoddGQ==
7579-
dependencies:
7580-
cookie "^1.0.1"
7581-
set-cookie-parser "^2.6.0"
7582-
75837563
react-select-event@^5.5.1:
75847564
version "5.5.1"
75857565
resolved "https://registry.yarnpkg.com/react-select-event/-/react-select-event-5.5.1.tgz#d67e04a6a51428b1534b15ecb1b82afbe5edddcb"
@@ -7983,11 +7963,6 @@ semver@^7.3.5, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.3, semve
79837963
resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
79847964
integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
79857965

7986-
set-cookie-parser@^2.6.0:
7987-
version "2.7.1"
7988-
resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz#3016f150072202dfbe90fadee053573cc89d2943"
7989-
integrity sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==
7990-
79917966
set-function-length@^1.2.1, set-function-length@^1.2.2:
79927967
version "1.2.2"
79937968
resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"

0 commit comments

Comments
 (0)