Skip to content

Commit

Permalink
Merge branch '7.17' into mergify/bp/7.17/pr-39392
Browse files Browse the repository at this point in the history
  • Loading branch information
pierrehilbert authored Jun 10, 2024
2 parents 20ad844 + b6f4a46 commit 6e7dafd
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
@@ -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
7 changes: 0 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,3 @@ repos:
rev: v4.0.1
hooks:
- id: check-merge-conflict

- repo: https://github.com/elastic/apm-pipeline-library.git
rev: current
hooks:
- id: check-jenkins-pipelines
files: ^(.ci/(.*\.groovy|Jenkinsfile)|Jenkinsfile)$
- id: check-jjbb

0 comments on commit 6e7dafd

Please sign in to comment.