From 530ddb0f0cecdc18a9c38a99c95ebe37630e911a Mon Sep 17 00:00:00 2001
From: m2 <69128853+m2Giles@users.noreply.github.com>
Date: Tue, 5 Nov 2024 10:25:55 -0500
Subject: [PATCH] chore(ci): stable-daily run on merge-group (#1888)

Co-authored-by: Benjamin Sherman <benjamin@holyarmy.org>
---
 .github/workflows/build-image-beta.yml   |  5 -----
 .github/workflows/build-image-latest.yml |  5 -----
 .github/workflows/build-image-stable.yml |  1 +
 .github/workflows/generate_changelog.yml | 22 ----------------------
 4 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 .github/workflows/generate_changelog.yml

diff --git a/.github/workflows/build-image-beta.yml b/.github/workflows/build-image-beta.yml
index 781c0030fc9..f82d29c8538 100644
--- a/.github/workflows/build-image-beta.yml
+++ b/.github/workflows/build-image-beta.yml
@@ -7,11 +7,6 @@ on:
       - testing
     paths-ignore:
       - "**.md"
-  push:
-    branches:
-      - main
-    paths-ignore:
-      - "**.md"
   schedule:
     - cron: "40 4 * * 1,2,3,4,5,6" # 4:40 UTC All But Sunday
     - cron: "40 4 * * 0" # 4:40 UTC Sunday
diff --git a/.github/workflows/build-image-latest.yml b/.github/workflows/build-image-latest.yml
index cb9bd625d1d..12eafedf522 100644
--- a/.github/workflows/build-image-latest.yml
+++ b/.github/workflows/build-image-latest.yml
@@ -7,11 +7,6 @@ on:
       - testing
     paths-ignore:
       - "**.md"
-  push:
-    branches:
-      - main
-    paths-ignore:
-      - "**.md"
   schedule:
     - cron: "40 4 * * 1,2,3,4,5,6" # 4:40 UTC All But Sunday
     - cron: "40 4 * * 0" # 4:40 UTC Sunday
diff --git a/.github/workflows/build-image-stable.yml b/.github/workflows/build-image-stable.yml
index 1cc1855e7e8..822bc2a8624 100644
--- a/.github/workflows/build-image-stable.yml
+++ b/.github/workflows/build-image-stable.yml
@@ -1,5 +1,6 @@
 name: Stable Images
 on:
+  merge_group: # Make Stable-Daily run on merge groups
   pull_request:
     branches:
       - main
diff --git a/.github/workflows/generate_changelog.yml b/.github/workflows/generate_changelog.yml
deleted file mode 100644
index 576fa0c22ee..00000000000
--- a/.github/workflows/generate_changelog.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-
-permissions:
-  contents: write
-  checks: write
-  actions: read
-  packages: write
-  pull-requests: write
-
-name: Generate Changelog
-jobs:
-  release-please:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: google-github-actions/release-please-action@e4dc86ba9405554aeba3c6bb2d169500e7d3b4ee # v4
-        id: release-please
-        with:
-          release-type: simple
-          package-name: release-please-action