search

freifunk-berlin / firmware

DEPRECATED: Build system for Berlin firmware. Please user the pinned falter-repos instead
https://berlin.freifunk.net
GNU General Public License v3.0
74 stars 34 forks source link

GHA/pr-conflict: add workflow to automatically find conflicting PRs #805

Closed SvenRoederer closed 4 years ago

SvenRoederer commented 4 years ago

Adds an GithubAction that checks if any open PR can not be merged on master branch after a new commit was made to the master branch. If such conflict will be detected, the affected PR will get the label "has conflicts". If during a following run a conflicting PR becomes mergable, the flag will be removed again. This action is based on https://github.com/marketplace/actions/auto-label-merge-conflicts

This requires the correct label "has conflicts" needs to be created or the actions config must be adapted.

SvenRoederer commented 4 years ago

added a Label "has conflicts" to the PRs - after merging some PRs where instantly marked with this label --> works as expected.