Repository navigation
[iobroker-bot] Setup Auto-Merge for Dependabot PRs - #2407
Merged
GermanBluefox merged 1 commit intoOct 16, 2026
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
German description can be found below | Deutsche Beschreibung weiter unten
General information
This PR has been created by iobroker-bot. Please review the changes carefully and merge the PR if review is ok.
Feel free to contact me (@ioBroker-Bot) if you have any questions or feel that a PR is faulty. Please open an issue at repository https://github.com/ioBroker/ioBroker.repochecker to report a faulty PR.
And THANKS A LOT for maintaining this adapter from me and all users.
Let's work together for the best user experience.
your
ioBroker Check and Service Bot
@mcm1957 for evidence
Changes provided by this PR
This PR adapts the existing automatic merging setup for Dependabot pull requests. An existing workflow using
iobroker-bot-orga/action-automerge-dependabotwas detected (automerge-dependabot.yml) and will be updated.Background
GitHub has announced that they will discontinue processing Dependabot merge commands on January 27, 2026. The old approach of using comment commands like
@dependabot mergewill no longer work after this date.Additionally, GitHub will block the
pull_request_targettrigger by default starting November 2, 2026 for all PRs based on a fork. Existing workflows usingpull_request_targetneed to be migrated topull_requestbefore that date. This PR uses thepull_requesttrigger, which is sufficient for Dependabot PRs because GitHub grants write-access tokens to workflows triggered by Dependabot even with the standardpull_requestevent.What this PR does
This PR replaces the current setup for auto-merging Dependabot PRs with a new workflow that uses the
iobroker-bot-orga/action-automerge-dependabotaction. Specifically:Updates existing workflow: The existing workflow file
.github/workflows/automerge-dependabot.ymlis updated to use thepull_requesttrigger instead ofpull_request_target. This is required because GitHub will blockpull_request_targetfor all fork PRs by default starting November 2, 2026.Creates auto-merge configuration: If not already present, a configuration file
.github/auto-merge.ymlis created. This file defines which types of dependency updates should be automatically merged:Disables old workflows: If existing automerge workflow files are found (such as
dependabot-automerge.ymlordependabot-auto-merge.yml), they will be renamed to.OLDfiles. This preserves them for reference but prevents them from running.Important notes
This PR is not mandatory. It is up to the developer to review and decide whether to merge this PR.
The new workflow will:
.github/auto-merge.ymlConfiguration
The default configuration in
.github/auto-merge.ymlcan be customized to match your needs. For example, you can:Please refer to the comments in the
.github/auto-merge.ymlfile for more configuration options and examples.References
Deutsche Beschreibung
Dieser PR passt das vorhandene Setup zum automatischen Mergen von Dependabot-Pull-Requests an. Ein bestehender Workflow, der
iobroker-bot-orga/action-automerge-dependabotverwendet, wurde gefunden (automerge-dependabot.yml) und wird aktualisiert.Hintergrund
GitHub hat angekündigt, dass die Verarbeitung von Dependabot-Merge-Befehlen am 27. Januar 2026 eingestellt wird. Der alte Ansatz mit Kommentar-Befehlen wie
@dependabot mergewird nach diesem Datum nicht mehr funktionieren.Darüber hinaus wird GitHub den
pull_request_target-Trigger ab dem 2. November 2026 standardmäßig blockieren, und zwar für alle PRs, die auf einem Fork basieren. Bestehende Workflows, diepull_request_targetverwenden, müssen vor diesem Datum aufpull_requestmigriert werden. Dieser PR verwendet denpull_request-Trigger, der für Dependabot-PRs ausreicht, da GitHub Workflows, die durch Dependabot ausgelöst werden, auch beim Standard-pull_request-Event Write-Access-Tokens gewährt.Was dieser PR macht
Dieser PR ersetzt das aktuelle Setup zum automatischen Mergen von Dependabot-PRs durch einen neuen Workflow, der die Aktion
iobroker-bot-orga/action-automerge-dependabotverwendet. Konkret:Aktualisiert vorhandenen Workflow: Die vorhandene Workflow-Datei
.github/workflows/automerge-dependabot.ymlwird aktualisiert, um denpull_request-Trigger anstelle vonpull_request_targetzu verwenden. Dies ist erforderlich, da GitHubpull_request_targetfür alle Fork-PRs ab dem 2. November 2026 standardmäßig blockieren wird.Erstellt Auto-Merge-Konfiguration: Falls noch nicht vorhanden, wird eine Konfigurationsdatei
.github/auto-merge.ymlerstellt. Diese Datei definiert, welche Arten von Abhängigkeits-Updates automatisch gemergt werden sollen:Deaktiviert alte Workflows: Falls vorhandene Automerge-Workflow-Dateien gefunden werden (wie
dependabot-automerge.ymloderdependabot-auto-merge.yml), werden diese in.OLD-Dateien umbenannt. Dies bewahrt sie als Referenz, verhindert aber deren Ausführung.Wichtige Hinweise
Dieser PR ist nicht verpflichtend. Es liegt am Entwickler, diesen PR zu prüfen und zu entscheiden, ob er gemergt werden soll.
Der neue Workflow wird:
.github/auto-merge.ymldefinierten Merge-Regeln beachtenKonfiguration
Die Standardkonfiguration in
.github/auto-merge.ymlkann an die eigenen Bedürfnisse angepasst werden. Beispielsweise kann man:Bitte die Kommentare in der
.github/auto-merge.yml-Datei für weitere Konfigurationsoptionen und Beispiele beachten.Referenzen
You my recreate this PR by adding the following comment:
@ioBroker-Bot recreate
Template: X0000-setupAutomergeDependabot