From bb642387a89ff495836bbe72946cead64e578444 Mon Sep 17 00:00:00 2001
From: Victor Martinez <victormartinezrubio@gmail.com>
Date: Tue, 4 Jun 2024 19:48:56 +0200
Subject: [PATCH] github-action: support check/lint/pre-commit (#38175)

(cherry picked from commit bef2cc6beb8b5fa42a35678433375a5a48eb1032)

# Conflicts:
#	.pre-commit-config.yaml
---
 .github/workflows/pre-commit.yml | 18 ++++++++++++++++++
 .pre-commit-config.yaml          |  3 +++
 2 files changed, 21 insertions(+)
 create mode 100644 .github/workflows/pre-commit.yml

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
new file mode 100644
index 00000000000..096dee6bea5
--- /dev/null
+++ b/.github/workflows/pre-commit.yml
@@ -0,0 +1,18 @@
+name: pre-commit
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - 7.1*
+      - 8.*
+
+permissions:
+  contents: read
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: elastic/apm-pipeline-library/.github/actions/pre-commit@current
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 200d0b9277a..09d459d0ece 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,6 +3,7 @@ repos:
     rev: v4.4.0
     hooks:
     -   id: check-merge-conflict
+<<<<<<< HEAD
 
 -   repo: https://github.com/elastic/apm-pipeline-library.git
     rev: v1.1.397
@@ -10,3 +11,5 @@ repos:
     -   id: check-jenkins-pipelines
         files: ^(.ci/(.*\.groovy|Jenkinsfile)|Jenkinsfile)$
     -   id: check-jjbb
+=======
+>>>>>>> bef2cc6beb (github-action: support check/lint/pre-commit (#38175))