From 826e748629d652495489f44384f8f74054b2b621 Mon Sep 17 00:00:00 2001
From: Michael Sproul <michael@sigmaprime.io>
Date: Tue, 2 May 2023 11:59:51 +1000
Subject: [PATCH] Prepare CI for merge queues (#4252)

* Prepare CI for merge queues

* Fix syntax SNAFUs
---
 .github/workflows/docker.yml        | 6 ------
 .github/workflows/linkcheck.yml     | 1 +
 .github/workflows/local-testnet.yml | 1 +
 .github/workflows/test-suite.yml    | 3 ++-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index f2ccaf438a..c3119db378 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,7 +5,6 @@ on:
         branches:
             - unstable
             - stable
-            - capella
         tags:
             - v*
 
@@ -35,11 +34,6 @@ jobs:
               run: |
                     echo "VERSION=latest" >> $GITHUB_ENV
                     echo "VERSION_SUFFIX=-unstable" >> $GITHUB_ENV
-            - name: Extract version (if capella)
-              if: github.event.ref == 'refs/heads/capella'
-              run: |
-                    echo "VERSION=capella" >> $GITHUB_ENV
-                    echo "VERSION_SUFFIX=" >> $GITHUB_ENV
             - name: Extract version (if tagged release)
               if: startsWith(github.event.ref, 'refs/tags')
               run: |
diff --git a/.github/workflows/linkcheck.yml b/.github/workflows/linkcheck.yml
index 4d4e92ae14..8428c0a3b0 100644
--- a/.github/workflows/linkcheck.yml
+++ b/.github/workflows/linkcheck.yml
@@ -7,6 +7,7 @@ on:
   pull_request:
     paths:
       - 'book/**'
+  merge_group:
 
 jobs:
   linkcheck:
diff --git a/.github/workflows/local-testnet.yml b/.github/workflows/local-testnet.yml
index a522f2efb9..1ca1006c1f 100644
--- a/.github/workflows/local-testnet.yml
+++ b/.github/workflows/local-testnet.yml
@@ -6,6 +6,7 @@ on:
     branches:
       - unstable
   pull_request:
+  merge_group:
 
 jobs:
   run-local-testnet:
diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
index b18d7ee959..27c91f2262 100644
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -8,6 +8,7 @@ on:
       - trying
       - 'pr/*'
   pull_request:
+  merge_group:
 env:
   # Deny warnings in CI
   # Disable debug info (see https://github.com/sigp/lighthouse/issues/4005)
@@ -20,7 +21,7 @@ jobs:
   target-branch-check:
     name: target-branch-check
     runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
     steps:
         - name: Check that the pull request is not targeting the stable branch
           run: test ${{ github.base_ref }} != "stable"