From c1a902e4f8487e1a4d245dcd998a6082931f1060 Mon Sep 17 00:00:00 2001
From: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Date: Wed, 26 Feb 2025 11:55:10 +0100
Subject: [PATCH] Add `merge_group` trigger to main workflow (#3162)

This adds `merge_group` to the main workflow, enabling us to use the
merge queue functionality.
---
 .github/workflows/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3ec34f585f..ba7898d5f9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - main
   pull_request:
+  merge_group:
 
 jobs:
   check-workflows:
@@ -54,7 +55,7 @@ jobs:
   publish-staging-simulator:
     name: Publish Snaps Simulator to `staging` folder
     needs: lint-build-test
-    if: ${{ github.ref_name == 'main' }}
+    if: ${{ github.ref_name == 'main' && github.event_name == 'push' }}
     permissions:
       contents: write
     uses: ./.github/workflows/publish-github-pages.yml