Skip to content

Commit

Permalink
ci: add merge commit check to commit linting
Browse files Browse the repository at this point in the history
  • Loading branch information
ferferga committed Aug 11, 2024
1 parent 5d6a7c8 commit 35e10cb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/__quality_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ jobs:
- name: Run typecheck 📖
run: npm run typecheck

conventional_commits:
name: Conventional commits check 💬
commits_checks:
name: Commit linting 💬✅
runs-on: ubuntu-latest

steps:
Expand All @@ -92,3 +92,8 @@ jobs:

- name: Check if all commits comply with the specification
uses: webiny/[email protected]

- name: Check for merge commits
run: |
git log --merges --oneline | grep -q "^" && exit 1 || exit 0
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
uses: ./.github/workflows/__quality_checks.yml
permissions: {}
with:
commit: ${{ github.event.pull_request.head.sha }}
commit: ${{ github.event.pull_request.head.ref }}

codeql:
name: GitHub CodeQL 🔬
Expand Down

0 comments on commit 35e10cb

Please sign in to comment.