From c0caacdb390c747f10d9b047035f64376358d391 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 10:28:14 +0100 Subject: [PATCH] github-actions(pre-commit): detect merge conflicts and shebangs (#6563) (#6570) (cherry picked from commit 0bf9e0653ec89a51fdc16b036d679547941e32fc) Co-authored-by: Victor Martinez --- .github/workflows/pre-commit.yml | 18 ++++++++++++++++++ .pre-commit-config.yaml | 5 ++++- 2 files changed, 22 insertions(+), 1 deletion(-) 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 0000000000..23545b29cb --- /dev/null +++ b/.github/workflows/pre-commit.yml @@ -0,0 +1,18 @@ +name: pre-commit + +on: + pull_request: + push: + branches: + - main + - 8.* + - 9.* + +permissions: + contents: read + +jobs: + pre-commit: + runs-on: ubuntu-latest + steps: + - uses: elastic/oblt-actions/pre-commit@v1 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 047700875f..44c4915bf9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,8 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 + rev: v4.6.0 hooks: + - id: check-executables-have-shebangs + - id: check-shebang-scripts-are-executable - id: check-merge-conflict + args: ['--assume-in-merge']