[pre-commit] for linting merge-conflict, pipelines and JJBB#28501
Merged
v1v merged 2 commits intoelastic:masterfrom Oct 19, 2021
Merged
[pre-commit] for linting merge-conflict, pipelines and JJBB#28501v1v merged 2 commits intoelastic:masterfrom
v1v merged 2 commits intoelastic:masterfrom
Conversation
botelastic
bot
added
needs_team
Contributor
|
This pull request does not have a backport label. Could you fix it @v1v? 🙏
NOTE: |
mergify
bot
added
the
backport-skip
v1v
added
automation
backport-v7.15.0
botelastic
bot
removed
the
needs_team
|
This pull request doesn't have a |
v1v
commented
Oct 18, 2021
| - repo: https://github.com/pre-commit/pre-commit-hooks | ||
| rev: v4.0.1 | ||
| hooks: | ||
| - id: check-merge-conflict |
Member
Author
There was a problem hiding this comment.
kuisathaverat
approved these changes
Oct 18, 2021
Contributor
💚 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:
|
mergify bot
pushed a commit
that referenced
this pull request
Oct 19, 2021
(cherry picked from commit 0a24250)
mergify bot
pushed a commit
that referenced
this pull request
Oct 19, 2021
(cherry picked from commit 0a24250)
v1v
added a commit
that referenced
this pull request
Oct 20, 2021
v1v
added a commit
that referenced
this pull request
Oct 20, 2021
Icedroid
pushed a commit
to Icedroid/beats
that referenced
this pull request
Nov 1, 2021
mergify bot
pushed a commit
that referenced
this pull request
Aug 22, 2022
(cherry picked from commit 0a24250)
v1v
added a commit
that referenced
this pull request
Aug 23, 2022
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
…28501) (elastic#28536) (cherry picked from commit 0a24250) Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
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.
Mergifycreates 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-commitwill be the way to detect those issuesTo ensure PRs with conflicts are failing in the CI.