-
Notifications
You must be signed in to change notification settings - Fork 4.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[pre-commit] for linting merge-conflict, pipelines and JJBB #28501
Conversation
This pull request does not have a backport label. Could you fix it @v1v? 🙏
NOTE: |
This pull request doesn't have a |
- repo: https://github.com/pre-commit/pre-commit-hooks | ||
rev: v4.0.1 | ||
hooks: | ||
- id: check-merge-conflict |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
💚 Flaky test reportTests succeeded. 🤖 GitHub commentsTo re-run your PR in the CI, just comment with:
|
(cherry picked from commit 0a24250)
(cherry picked from commit 0a24250)
…28536) (cherry picked from commit 0a24250) Co-authored-by: Victor Martinez <[email protected]>
…28537) (cherry picked from commit 0a24250) Co-authored-by: Victor Martinez <[email protected]>
(cherry picked from commit 0a24250)
…32747) (cherry picked from commit 0a24250) Co-authored-by: Victor Martinez <[email protected]>
…28501) (elastic#28536) (cherry picked from commit 0a24250) Co-authored-by: Victor Martinez <[email protected]>
What does this PR do?
Enable check for merge-conflicts, JJBB syntax validation and Pipelines in the CI
It runs in parallel
Why is it important?
Ensure we detect breaking changes before merging.
Mergify
creates automated backports but some of those backports contain conflicts, those conflicts are tagged with the labelconflict
.Unfortunately the CI does not evaluate if those changes contain any merge conflicts, so
pre-commit
will be the way to detect those issuesTo ensure PRs with conflicts are failing in the CI.