Skip to content

Commit

Permalink
github-actions(pre-commit): detect merge conflicts and shebangs (#4344)
Browse files Browse the repository at this point in the history
  • Loading branch information
v1v authored Jan 22, 2025
1 parent f1c29b9 commit efee993
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 0 deletions.
Empty file modified .buildkite/hooks/post-checkout
100644 → 100755
Empty file.
Empty file modified .buildkite/scripts/local_build.sh
100644 → 100755
Empty file.
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
- 8.*
- 9.*

permissions:
contents: read

jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: elastic/oblt-actions/pre-commit@v1
8 changes: 8 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
hooks:
- id: check-executables-have-shebangs
- id: check-shebang-scripts-are-executable
- id: check-merge-conflict
args: ['--assume-in-merge']
Empty file modified gobenchdata-checks.yml
100755 → 100644
Empty file.

0 comments on commit efee993

Please sign in to comment.