From 359c5537ca46cf87c63d19ef3bb01bc00862b985 Mon Sep 17 00:00:00 2001
From: Alex Tokarev <aleksator@gmail.com>
Date: Sun, 5 Nov 2023 16:15:53 +1100
Subject: [PATCH] non-conventional message

---
 .github/workflows/ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bf7df723..d1060414 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,8 +1,9 @@
 name: CI
 on:
   pull_request:
+  merge_group:
   push:
-    branches: [ release, dev ]
+    branches: [ release, dev, test_merge_queue, test ]
   schedule: [ cron: "0 6 * * 4" ]
 
 env:
@@ -103,6 +104,7 @@ jobs:
   check_commit_conventions:
     name: Commit messages follow project guidelines
     runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'merge_group' }}
     steps:
       - uses: actions/checkout@v2
         with:
@@ -110,4 +112,4 @@ jobs:
       - name: Check commit conventions
         uses: wagoid/commitlint-github-action@v2
         with:
-          configFile: .commitlintrc.yml
+          configFile: .commitlintrc.yml
\ No newline at end of file