QA: add reusable merge conflict check workflow #4
Conversation
This file contains 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
This commit introduces a new, reusable workflow to check if PRs are in a "conflict state", and if so, add a "merge conflict" label and leave a comment on the PR. The workflow uses a pre-existing action runner which offers a number of options to configure the action. While the workflow itself is pretty straight-forward, it has been set up as a reusable workflow to centrally manage the default option settings for all repos. Individual calling workflows can still overrule these defaults for the most pertinent options. For the less pertinent settings, this overload has not been enabled, but these options can still be opened up to calling workflows at a later point in time if there is a need for it. It also adds a workflow to use the reusable action for this repo. Even though it is pretty unlikely there will be a multiple PRs open at the same time for this repo, running the action on each merge will provide some basic QA. Refs: * https://github.com/eps1lon/actions-label-merge-conflict
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.
❗ This PR replaces PR #3 ❗
This commit introduces a new, reusable workflow to check if PRs are in a "conflict state", and if so, add a "merge conflict" label and leave a comment on the PR.
The workflow uses a pre-existing action runner which offers a number of options to configure the action.
While the workflow itself is pretty straight-forward, it has been set up as a reusable workflow to centrally manage the default option settings for all repos.
Individual calling workflows can still overrule these defaults for the most pertinent options.
For the less pertinent settings, this overload has not been enabled, but these options can still be opened up to calling workflows at a later point in time if there is a need for it.
It also adds a workflow to use the reusable action for this repo. Even though it is pretty unlikely there will be a multiple PRs open at the same time for this repo, running the action on each merge will provide some basic QA.
Refs: