From 662ba11ff1361eba297bd60e9e9cf1a0f376bd7c Mon Sep 17 00:00:00 2001
From: Scott Anderson <662325+scottanderson@users.noreply.github.com>
Date: Sat, 2 Aug 2025 21:16:45 -0400
Subject: [PATCH] Merge group (#1691)

## Description:

Attempt to support merge_group

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I process any text displayed to the user through translateText()
and I've added it to the en.json file
- [x] I have added relevant tests to the test directory
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [ ] I have read and accepted the CLA agreement (only required once).
---
 .github/workflows/ci.yml             |  2 ++
 .github/workflows/pr-description.yml | 25 +++++++++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 092ec8b42..0913182d1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,6 +2,8 @@ name: 🧪 CI
 
 on:
   merge_group:
+    types:
+      - checks_requested
   pull_request:
   push:
     branches: [main]
diff --git a/.github/workflows/pr-description.yml b/.github/workflows/pr-description.yml
index afb9fe5c5..d108aaab2 100644
--- a/.github/workflows/pr-description.yml
+++ b/.github/workflows/pr-description.yml
@@ -2,6 +2,8 @@ name: 🧼 PR
 
 on:
   merge_group:
+    types:
+      - checks_requested
   pull_request:
     types:
       - demilestoned
@@ -21,6 +23,11 @@ jobs:
       - uses: actions/github-script@v7
         with:
           script: |
+            if (context.eventName === 'merge_group') {
+              // Ignore merge_group events
+              return;
+            }
+
             const body = context.payload.pull_request.body || '';
 
             const errors = [];
@@ -61,10 +68,16 @@ jobs:
       - uses: actions/github-script@v7
         with:
           script: |
-            // Get the pull request data
-            const milestone = context.payload.pull_request.milestone;
-            if (!milestone) {
-              core.setFailed('❌ Pull request must have a milestone assigned before merging.');
-              return;
+            if (context.eventName === 'merge_group') {
+              // Ignore merge_group events
+            } else if (context.eventName === 'pull_request') {
+              // Get the pull request data
+              const milestone = context.payload.pull_request.milestone;
+              if (!milestone) {
+                core.setFailed('❌ Pull request must have a milestone assigned before merging.');
+                return;
+              }
+              console.log(`✅ Milestone found: ${milestone.title}`);
+            } else {
+              core.setFailed(`❌ Unknown event type ${context.eventName}.`);
             }
-            console.log(`✅ Milestone found: ${milestone.title}`);