Skip to content

Commit a8b3254

Browse files
auto merge
1 parent d587085 commit a8b3254

File tree

4 files changed

+41
-2
lines changed

4 files changed

+41
-2
lines changed

.github/auto-merge.yml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Configure here which dependency updates should be merged automatically.
2+
# The recommended configuration is the following:
3+
- match:
4+
# Only merge patches for production dependencies
5+
dependency_type: production
6+
update_type: "semver:patch"
7+
- match:
8+
# Except for security fixes, here we allow minor patches
9+
dependency_type: production
10+
update_type: "security:minor"
11+
- match:
12+
# and development dependencies can have a minor update, too
13+
dependency_type: development
14+
update_type: "semver:minor"
15+
16+
# The syntax is based on the legacy dependabot v1 automerged_updates syntax, see:
17+
# https://dependabot.com/docs/config-file/#automerged_updates
+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Automatically merge Dependabot PRs when version comparison is within the range
2+
# that is configured in .github/auto-merge.yml
3+
4+
name: Auto-Merge Dependabot PRs
5+
6+
on:
7+
pull_request_target:
8+
9+
jobs:
10+
auto-merge:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout code
14+
uses: actions/checkout@v4
15+
16+
- name: Check if PR should be auto-merged
17+
uses: ahmadnassri/action-dependabot-auto-merge@v2
18+
with:
19+
# This must be a personal access token with push access
20+
github-token: ${{ secrets.AUTO_MERGE_TOKEN }}
21+
# By default, squash and merge, so Github chooses nice commit messages
22+
command: squash and merge

.github/workflows/test-and-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
export SENTRY_URL=https://sentry.io
138138
export SENTRY_ORG=rg-engineering
139139
export SENTRY_PROJECT=iobroker_daswetter
140-
export SENTRY_VERSION=rg-engineering.daswetter@${{ steps.extract_release.outputs.VERSION }}
140+
export SENTRY_VERSION=iobroker.daswetter@${{ steps.extract_release.outputs.VERSION }}
141141
sentry-cli releases new $SENTRY_VERSION
142142
sentry-cli releases set-commits $SENTRY_VERSION --auto
143143
sentry-cli releases finalize $SENTRY_VERSION

.releaseconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"plugins": [ "iobroker", "license" ]
2+
"plugins": [ "iobroker", "license", "manual-review" ]
33
}

0 commit comments

Comments
 (0)