From 50d2f29324850aad471d9660d9e3bcf81dd2a811 Mon Sep 17 00:00:00 2001
From: Paul Balaji <paul@hyperlane.xyz>
Date: Thu, 6 Jun 2024 14:16:39 +0100
Subject: [PATCH] ci: configure merge queue for `main` (#3913)

- configure the rust/test workflows to support merge queues into `main`

---------

Signed-off-by: Paul Balaji <paul@hyperlane.xyz>
---
 .github/workflows/rust-skipped.yml | 2 ++
 .github/workflows/rust.yml         | 3 ++-
 .github/workflows/test.yml         | 6 ++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rust-skipped.yml b/.github/workflows/rust-skipped.yml
index b6e6c51cd..2d9fe8a5d 100644
--- a/.github/workflows/rust-skipped.yml
+++ b/.github/workflows/rust-skipped.yml
@@ -9,6 +9,8 @@ on:
     paths-ignore:
       - 'rust/**'
       - .github/workflows/rust.yml
+  # Support for merge queues
+  merge_group:
 
 env:
   CARGO_TERM_COLOR: always
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 48caa1f77..a6e270a48 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -6,7 +6,8 @@ on:
     paths:
       - 'rust/**'
       - .github/workflows/rust.yml
-
+  # Support for merge queues
+  merge_group:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b6bb18d5f..960b5b770 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,6 +7,8 @@ on:
   pull_request:
     branches:
       - '*' # run against all branches
+  # Support for merge queues
+  merge_group:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
@@ -224,7 +226,7 @@ jobs:
 
   e2e-matrix:
     runs-on: larger-runner
-    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'main')
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'main') || github.event_name == 'merge_group'
     needs: [yarn-build, checkout-registry]
     strategy:
       matrix:
@@ -325,7 +327,7 @@ jobs:
 
   cli-e2e:
     runs-on: larger-runner
-    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'main')
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'main') || github.event_name == 'merge_group'
     needs: [yarn-build, checkout-registry]
     strategy:
       matrix: