diff --git a/.github/workflows/__quality_checks.yml b/.github/workflows/__quality_checks.yml index c52c7d534ad..434c740e8ae 100644 --- a/.github/workflows/__quality_checks.yml +++ b/.github/workflows/__quality_checks.yml @@ -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: @@ -92,3 +92,8 @@ jobs: - name: Check if all commits comply with the specification uses: webiny/action-conventional-commits@v1.3.0 + + - name: Check for merge commits + run: | + git log --merges --oneline | grep -q "^" && exit 1 || exit 0 + diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 66f7c8c3f16..e1f109681a3 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -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 🔬