From abb330d496abe0897d295f1369d845a5b5e1c8c5 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 10 Dec 2024 17:19:20 +0000
Subject: [PATCH] github/workflows: use merge_group instead of push events.

We're currently doing both which doubles the number of jobs we end up
running for commits on `master`.
---
 .github/workflows/actionlint.yml | 3 ---
 .github/workflows/docker.yml     | 5 +----
 .github/workflows/docs.yml       | 3 ---
 .github/workflows/tests.yml      | 3 ---
 4 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/.github/workflows/actionlint.yml b/.github/workflows/actionlint.yml
index d3b3da0c6ee88..8d68cac31260e 100644
--- a/.github/workflows/actionlint.yml
+++ b/.github/workflows/actionlint.yml
@@ -2,8 +2,6 @@ name: actionlint
 
 on:
   push:
-    branches:
-      - master
     paths:
       - '.github/workflows/*.ya?ml'
       - '.github/actionlint.yaml'
@@ -11,7 +9,6 @@ on:
     paths:
       - '.github/workflows/*.ya?ml'
       - '.github/actionlint.yaml'
-  merge_group:
 
 env:
   HOMEBREW_DEVELOPER: 1
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d1c41aef1d56e..ac3c56d8a1594 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -2,9 +2,6 @@ name: Docker
 
 on:
   pull_request:
-  push:
-    branches:
-      - master
   merge_group:
   release:
     types:
@@ -75,7 +72,7 @@ jobs:
                 "homebrew/brew:latest"
               )
             fi
-          elif [[ "${GITHUB_EVENT_NAME}" == "push" &&
+          elif [[ "${GITHUB_EVENT_NAME}" == "merge_group" &&
                   "${GITHUB_REF}" == "refs/heads/master" &&
                   "${{ matrix.version }}" == "22.04" ]]; then
             tags+=(
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index d4464c97db4a0..84a849a63ab53 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -1,9 +1,6 @@
 name: Documentation CI
 
 on:
-  push:
-    branches:
-      - master
   pull_request:
   merge_group:
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 27985bd4d7e2a..cfeb09c78ad7a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,9 +1,6 @@
 name: CI
 
 on:
-  push:
-    branches:
-      - master
   pull_request:
   merge_group: