github-action: support check/lint/pre-commit (#38175)

(cherry picked from commit bef2cc6) # Conflicts: # .pre-commit-config.yaml
elastic · Jun 4, 2024 · bb64238 · bb64238
1 parent c46512f
commit bb64238
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/.github/workflows/pre-commit.yml 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
@@ -3,10 +3,13 @@ repos:
  rev: v4.4.0
  hooks:
  - id: check-merge-conflict
+<<<<<<< HEAD
 
 - repo: https://github.com/elastic/apm-pipeline-library.git
  rev: v1.1.397
  hooks:
  - id: check-jenkins-pipelines
  files: ^(.ci/(.*\.groovy|Jenkinsfile)|Jenkinsfile)$
  - id: check-jjbb
+=======
+>>>>>>> bef2cc6beb (github-action: support check/lint/pre-commit (#38175))