From 9cecac0cee11a7c275e9b8240d5b0114339620f0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 6 Apr 2023 15:30:56 +0100
Subject: [PATCH] Only respect X-Needs-Percy in the Merge Queue (#10520)

* Enable merge queues

* Iterate

* Iterate

* iterate

* Only respect X-Needs-Percy in the Merge Queue
---
 .github/workflows/cypress.yaml | 2 +-
 docs/cypress.md                | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml
index c7be554a21..b9ab85fa15 100644
--- a/.github/workflows/cypress.yaml
+++ b/.github/workflows/cypress.yaml
@@ -65,7 +65,7 @@ jobs:
               if: |
                   github.event.workflow_run.event == 'schedule' ||
                   (
-                    github.event.workflow_run.event == 'pull_request' &&
+                    github.event.workflow_run.event == 'merge_queue' &&
                     contains(fromJSON(steps.prdetails.outputs.data).labels.*.name, 'X-Needs-Percy')
                   )
               run: echo "::set-output name=value::1"
diff --git a/docs/cypress.md b/docs/cypress.md
index 8d95876c06..b9e260ee20 100644
--- a/docs/cypress.md
+++ b/docs/cypress.md
@@ -215,7 +215,8 @@ nightly build at approximately 04:00 UTC every day. (The schedule is defined in
 enabled/disabled in [cypress.yaml](../.github/workflows/cypress.yaml).)
 
 If your pull request makes visual changes, you are encouraged to request Percy
-to run by adding the label `X-Needs-Percy` to the PR. This will help us find any
+to run by adding the label `X-Needs-Percy` to the PR, these will only run in
+the merge queue to save snapshots. This will help us find any
 visual bugs or validate visual changes at the time they are made, instead of
 having to figure it out later after the nightly build. If you don't have
 permission to add a label, please ask your reviewer to do it. Note: it's best to