From 121a83b758dcd50076460963ec09725384ee830e Mon Sep 17 00:00:00 2001
From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>
Date: Wed, 14 Feb 2024 11:44:32 -0700
Subject: [PATCH] [chore] Adjust merge queue actions (#31266)

Merge queue doesn't have access to `github.event.pull_request`, so we
need extra checks.
---
 .github/workflows/build-and-test-windows.yml | 4 ++--
 .github/workflows/changelog.yml              | 1 -
 .github/workflows/check-links.yaml           | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml
index 501bc0b00d13..101e76f97fd3 100644
--- a/.github/workflows/build-and-test-windows.yml
+++ b/.github/workflows/build-and-test-windows.yml
@@ -37,7 +37,7 @@ jobs:
           - cmd
           - other
     runs-on: windows-latest
-    if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push') }}
+    if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push' || github.event_name == 'merge_group') }}
     env:
       # Limit memory usage via GC environment variables to avoid OOM on GH runners, especially for `cmd/otelcontribcol`,
       # see https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/28682#issuecomment-1802296776
@@ -67,7 +67,7 @@ jobs:
       - name: Run Unit tests
         run: make -j2 gotest GROUP=${{ matrix.group }}
   windows-unittest:
-    if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push') }}
+    if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push' || github.event_name == 'merge_group') }}
     runs-on: windows-latest
     needs: [windows-unittest-matrix]
     steps:
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index 1423a777a2e4..d3cf3b18459d 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -6,7 +6,6 @@
 name: changelog
 
 on:
-  merge_group:
   pull_request:
     types: [opened, synchronize, reopened, labeled, unlabeled]
     branches:
diff --git a/.github/workflows/check-links.yaml b/.github/workflows/check-links.yaml
index 8d08e4b5931a..83817d99f1f5 100644
--- a/.github/workflows/check-links.yaml
+++ b/.github/workflows/check-links.yaml
@@ -3,7 +3,6 @@ on:
   push:
     branches: [ main ]
   pull_request:
-  merge_group:
 
 # Do not cancel this workflow on main. See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/16616
 concurrency: