GH Actions: update merge conflict check workflow #519
Merged
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
The `mschilde/auto-label-merge-conflicts` action runner is not actively maintained and is currently failing due to an unhandled deprecation notice. [Example](https://github.com/PHPCSStandards/PHP_CodeSniffer/actions/runs/9380398878/job/25827454084) I've evaluated the action runners available for this kind of thing and am proposing to switch to the `eps1lon/actions-label-merge-conflict` action runner, which should be a one-on-one replacement for the currently used functionality. Additionally, that action has an option to post a comment when a conflict is detected as well as when the conflict has been resolved. While not currently used, this feature might be useful in the future. Note: unfortunately, I won't be able to test the change until merged into the `master` branch, so this may need further tweaks once merged. Refs: * https://github.com/marketplace?query=label+merge+conflicts * https://github.com/mschilde/auto-label-merge-conflicts * https://github.com/eps1lon/actions-label-merge-conflict
|
Looks like it's working as intended: https://github.com/PHPCSStandards/PHP_CodeSniffer/actions/runs/9381613073/job/25831215405 👍🏻 |
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.
Description
The
mschilde/auto-label-merge-conflictsaction runner is not actively maintained and is currently failing due to an unhandled deprecation notice. ExampleI've evaluated the action runners available for this kind of thing and am proposing to switch to the
eps1lon/actions-label-merge-conflictaction runner, which should be a one-on-one replacement for the currently used functionality.Additionally, that action has an option to post a comment when a conflict is detected as well as when the conflict has been resolved. While not currently used, this feature might be useful in the future.
Note: unfortunately, I won't be able to test the change until merged into the
masterbranch, so this may need further tweaks once merged.Refs:
Suggested changelog entry
N/A