Skip to content

github-actions(pre-commit): detect merge conflicts and shebangs#4778

Merged
v1v merged 1 commit into
elastic:mainfrom
v1v:feature/support-pre-commit-with-merge-conflicts
Jan 28, 2025
Merged

github-actions(pre-commit): detect merge conflicts and shebangs#4778
v1v merged 1 commit into
elastic:mainfrom
v1v:feature/support-pre-commit-with-merge-conflicts

Conversation

@v1v

@v1v v1v commented Jan 21, 2025

Copy link
Copy Markdown
Member

Description

Use pre-commit with a subset of checks and run in the CI.

Similarly done at elastic/beats#42377

Help with detecting merge conflicts or shebang issues in the shell scripts

Documentation sets edited in this PR

Check all that apply.

  • Stateful (docs/en/observability/*)
  • Serverless (docs/en/serverless/*)
  • Integrations Developer Guide (docs/en/integrations/*)
  • None of the above

Related issue

Closes #

Checklist

  • Product/Engineering Review
  • Writer Review

Follow-up tasks

Select one.

  • This PR does not need to be ported to another doc set because:
    • The concepts in this PR only apply to one doc set (serverless or stateful)
    • The PR contains edits to both doc sets (serverless and stateful)
  • This PR needs to be ported to another doc set:
    • Port to stateful docs: <link to PR or tracking issue>
    • Port to serverless docs: <link to PR or tracking issue>

@v1v v1v added backport-7.17 Automated backport with mergify backport-8.x Automated backport to the 8.x branch with mergify backport-8.16 Automated backport with mergify backport-8.17 Automated backport with mergify labels Jan 21, 2025
@v1v v1v self-assigned this Jan 21, 2025
@v1v v1v requested a review from a team as a code owner January 21, 2025 18:37
@v1v v1v enabled auto-merge (squash) January 22, 2025 10:27
@v1v v1v merged commit aa68137 into elastic:main Jan 28, 2025
mergify Bot pushed a commit that referenced this pull request Jan 28, 2025
@v1v @mergify
github-actions(pre-commit): detect merge conflicts and shebangs (#4778)
e49ff0b 
(cherry picked from commit aa68137)
@mergify mergify Bot mentioned this pull request Jan 28, 2025
Merged
10 tasks
mergify Bot pushed a commit that referenced this pull request Jan 28, 2025
@v1v @mergify
github-actions(pre-commit): detect merge conflicts and shebangs (#4778)
a8e1d63 
(cherry picked from commit aa68137)
@mergify mergify Bot mentioned this pull request Jan 28, 2025
Merged
10 tasks
mergify Bot pushed a commit that referenced this pull request Jan 28, 2025
@v1v @mergify
github-actions(pre-commit): detect merge conflicts and shebangs (#4778)
2c8d468 
(cherry picked from commit aa68137)
@mergify mergify Bot mentioned this pull request Jan 28, 2025
Merged
10 tasks
mergify Bot pushed a commit that referenced this pull request Jan 28, 2025
@v1v @mergify
github-actions(pre-commit): detect merge conflicts and shebangs (#4778)
73388f6 
(cherry picked from commit aa68137)
@mergify mergify Bot mentioned this pull request Jan 28, 2025
Merged
10 tasks
bmorelli25 pushed a commit that referenced this pull request Jan 28, 2025
@mergify @v1v
github-actions(pre-commit): detect merge conflicts and shebangs (#4778)…
960fbb4 
… (#4792)

(cherry picked from commit aa68137)

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
bmorelli25 pushed a commit that referenced this pull request Jan 28, 2025
@mergify @v1v
github-actions(pre-commit): detect merge conflicts and shebangs (#4778)…
e901af7 
… (#4791)

(cherry picked from commit aa68137)

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
bmorelli25 pushed a commit that referenced this pull request Jan 28, 2025
@mergify @v1v
github-actions(pre-commit): detect merge conflicts and shebangs (#4778)…
f37c4f2 
… (#4793)

(cherry picked from commit aa68137)

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
v1v pushed a commit that referenced this pull request Jan 28, 2025
@mergify
github-actions(pre-commit): detect merge conflicts and shebangs (#4778)…
230424e 
… (#4790)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bmorelli25 bmorelli25 bmorelli25 approved these changes

Assignees

@v1v v1v

Labels

backport-7.17 Automated backport with mergify backport-8.x Automated backport to the 8.x branch with mergify backport-8.16 Automated backport with mergify backport-8.17 Automated backport with mergify needs-writer-review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@v1v @bmorelli25