testcontainers / testcontainers/testcontainers-java
Combine many dependabot PRs into one
Dieses Issue hat noch niemand übernommen.
- Vorherrschende Sprache
- Java
- Sterne
- 8.7k
- Forks
- 1.9k
- Ø Merge
- 2 T. 17 Std.
- Gemergte PRs (30 T.)
- 9
Beschreibung
#4135 explored a scripted approach (running client side) of combining multiple PRs into one.
The motivation is that the sheer volume of dependabot PRs creates a weekly multi-hour merge chore, as well as obscuring real PRs by real people - both of which are terrible.
https://github.com/dependabot/dependabot-core/issues/1190 looks like it won't happen any time soon.
https://www.hrvey.com/blog/combine-dependabot-prs looks very promising and I think we should give it a try instead of my previous script attempt. I'd like to verify:
- that, as seen in #4135, we can have the release notes updates automatically. We'd need to:
- enable merge commits in this repo, and make sure we use them when merging the combined PR
- (I think) update our release-drafter workflow triggers, so that pull request events trigger release drafter. Even if not required, we should probably do that anyway.
- that merge conflicts are not too big a problem. We'll likely seem them occurring with changes in adjacent lines in
build.gradlefiles, which may or may not be a nuisance.- if merge conflicts are a problem, I have written a dirt-simple git merge driver script which seems to work well enough for
build.gradlefiles - perhaps we could explore using this.
- if merge conflicts are a problem, I have written a dirt-simple git merge driver script which seems to work well enough for
Beitragsleitfaden
Erste Schritte
- Lies das ganze Issue und danach den Beitragsleitfaden des Projekts.
- Schreib ins Issue, dass du es übernimmst — das erspart doppelte Arbeit.
- Forke das Repository und arbeite in einem Branch.
- Öffne einen Pull Request, der die Issue-Nummer nennt.
Rechercherichtung
Beginne mit der Prüfung von #4135 und des im Issue referenzierten Workflows release-drafter. Teste, ob das Kombinieren von Dependabot PRs mit merge commits die Release Notes korrekt aktualisiert, und bewerte anschließend Merge-Konflikte in den Dateien build.gradle; abgeschlossen ist die Aufgabe, wenn der Workflow zuverlässig ist und die Konflikte beherrschbar sind.
Vom Indexierungsmodell aus dem Issue-Text verfasst.
Bewertung
- Tech-Stack
- git, github-actions
- Bereich
- build-system, ci-cd, release
- Issue-Typ
- Feature
- Schwierigkeit
- 4/5
- Geschätzter Aufwand
- 3-5 Tage
- Aktivitätsstatus
- Veraltet
- Klarheit
- Größtenteils klar
- Anfängerfreundlichkeit
- 28/100