From 8d3437da829ed4fc2c4ee632a7b2b455ee9cbfab Mon Sep 17 00:00:00 2001
From: spaenleh <spaenleh@gmail.com>
Date: Fri, 16 Feb 2024 10:22:43 +0100
Subject: [PATCH] fix: configure merge queue

---
 .github/workflows/ci.yml      | 5 ++++-
 .github/workflows/cypress.yml | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 683fa7cca..0b42edb96 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,9 @@
 name: CI checks
 
-on: [push]
+on:
+  push:
+  merge_group:
+  pull_request:
 
 jobs:
   build-and-test:
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
index a753fdb6a..db9eba9a7 100644
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -1,9 +1,9 @@
 name: Cypress CI
 
-# Control when the action will run
 on:
-  # Triggers the workflow on push events except for the main branch
   push:
+  merge_group:
+  pull_request:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}