search

PHPCSStandards / PHP_CodeSniffer

PHP_CodeSniffer tokenizes PHP files and detects violations of a defined set of coding standards.
BSD 3-Clause "New" or "Revised" License
805 stars 47 forks source link

GH Actions: update merge conflict check workflow #519

Closed jrfnl closed 1 month ago

jrfnl commented 1 month ago

Description

The mschilde/auto-label-merge-conflicts action runner is not actively maintained and is currently failing due to an unhandled deprecation notice. Example

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:

Suggested changelog entry

N/A

jrfnl commented 1 month ago

Looks like it's working as intended: https://github.com/PHPCSStandards/PHP_CodeSniffer/actions/runs/9381613073/job/25831215405 👍🏻