Skip to content

Commit 41ba21f

Browse files
committed
Merge branch 'dev' into ms/#1325-fix-handling-of-inputModelType-in-processor
# Conflicts: # CHANGELOG.md
2 parents c5d99d9 + 2098b4b commit 41ba21f

File tree

5 files changed

+22
-7
lines changed

5 files changed

+22
-7
lines changed

.github/CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Reviewers for Dependabot PRs
2+
build.gradle @sebastian-peter @danielfeismann @staudtMarius
3+
4+
# Reviewers for CI/CD related PRs
5+
.github/workflows/ @sebastian-peter @PhilippSchmelter

.github/dependabot.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ updates:
77
time: "04:00"
88
open-pull-requests-limit: 10
99
target-branch: dev
10-
reviewers:
11-
- t-ober
12-
- staudtMarius
13-
- sebastian-peter
14-
- danielfeismann
15-
- jo-bao
1610

1711
- package-ecosystem: pip
1812
directory: "/docs/readthedocs"

.github/workflows/dependabot-auto-merge.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,19 @@ jobs:
1616
with:
1717
github-token: "${{ secrets.GITHUB_TOKEN }}"
1818

19+
- name: Check Snapshot
20+
if: contains(steps.metadata.outputs.new-version, 'snap')
21+
run: |
22+
echo "::error::Snapshot versions are not allowed – workflow stopped."
23+
exit 1
24+
25+
- name: Approve the PR
26+
if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
27+
run: gh pr review --approve "$PR_URL"
28+
env:
29+
PR_URL: ${{github.event.pull_request.html_url}}
30+
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
31+
1932
- name: Enable auto-merge for Dependabot PRs
2033
if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
2134
run: gh pr merge --auto --merge "$PR_URL"

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99
### Fixed
1010
- Fixed handling of `CongestionResult.InputModelType` in `EntityProcessor` [#1325](https://github.com/ie3-institute/PowerSystemDataModel/issues/1325)
1111

12+
### Changed
13+
- Updated dependabot workflow and added CODEOWNERS [#1328](https://github.com/ie3-institute/PowerSystemDataModel/issues/1328)
14+
1215
## [7.0.0] - 2025-05-08
1316

1417
### Added

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
id 'signing'
66
id 'pmd' // code check, working on source code
77
id 'com.diffplug.spotless' version '7.0.3' //code format
8-
id 'com.github.spotbugs' version '6.1.11' // code check, working on byte code
8+
id 'com.github.spotbugs' version '6.1.12' // code check, working on byte code
99
id 'de.undercouch.download' version '5.6.0'
1010
id 'kr.motd.sphinx' version '2.10.1' // documentation generation
1111
id 'jacoco' // java code coverage plugin

0 commit comments

Comments
 (0)