chore: use merge queue to validate commit message (#815)

coveo · Apr 23, 2024 · 143cc9c · 143cc9c
1 parent 21f4b32
commit 143cc9c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/.github/actions/merge-commit/action.yml b/.github/actions/merge-commit/action.yml
@@ -0,0 +1,7 @@
+name: Check merge commit
+description: Ensure that the merge commit message is conventional
+runs:
+  using: composite
+  steps:
+    - run: npx commitlint --last --verbose
+      shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,6 +6,7 @@ on:
     push:
         branches:
             - 'main'
+    merge_group:
 jobs:
     CI:
         runs-on: ubuntu-latest
@@ -17,6 +18,9 @@ jobs:
               uses: ./.github/actions/setup
             - name: Check lockfiles
               uses: ./.github/actions/lockfiles
+            - name: Check merge commit
+              if: github.event_name == 'merge_group'
+              uses: ./.github/actions/merge-commit
             - name: Tests
               run: npm test
             - name: Build