chore: add merge queue

graasp · Mar 13, 2024 · bdda330 · bdda330
1 parent 05dab67
commit bdda330
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -1,11 +1,11 @@
 name: Cypress CI
 
-# Control when the action will run
 on:
-  # Triggers the workflow on push events except for the main branch
   push:
-    branches-ignore:
+    branches:
       - main
+  merge_group:
+  pull_request:
 
 concurrency:
   group: cypress-${{ github.ref }}
@@ -30,7 +30,7 @@ jobs:
 
       #  use the Cypress GitHub Action to run Cypress tests within the chrome browser
       - name: Cypress run
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         with:
           install: false
           start: yarn dev