From 24fc8aafb4c6a38dd182a3620e87efbd88fc0318 Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Fri, 2 Aug 2024 18:32:33 +0200
Subject: [PATCH] Prepare use of GitHub merge queues (#3408)

Merge queues should help us avoid having to merge from main repeatedly
even when all approvals are in and all CI jobs have succeeded. See
https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 and MIT licenses.

Co-authored-by: Felipe R. Monteiro <felisous@amazon.com>
---
 .github/workflows/audit.yml        | 1 +
 .github/workflows/format-check.yml | 1 +
 .github/workflows/kani.yml         | 1 +
 .github/workflows/release.yml      | 1 +
 4 files changed, 4 insertions(+)

diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
index 3ae9d192f376..5b75d6162c85 100644
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -7,6 +7,7 @@
 name: Cargo Audit
 on:
   pull_request:
+  merge_group:
   push:
     # Run on changes to branches but not tags.
     branches:
diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml
index 5ab7dcb1b9c3..cc13306a4eaf 100644
--- a/.github/workflows/format-check.yml
+++ b/.github/workflows/format-check.yml
@@ -3,6 +3,7 @@
 name: Kani Format Check
 on:
   pull_request:
+  merge_group:
   push:
     # Not just any push, as that includes tags.
     # We don't want to re-trigger this workflow when tagging an existing commit.
diff --git a/.github/workflows/kani.yml b/.github/workflows/kani.yml
index dd077eff25e1..a565c9cd4cbe 100644
--- a/.github/workflows/kani.yml
+++ b/.github/workflows/kani.yml
@@ -3,6 +3,7 @@
 name: Kani CI
 on:
   pull_request:
+  merge_group:
   push:
     # Not just any push, as that includes tags.
     # We don't want to re-trigger this workflow when tagging an existing commit.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 72ef4e2de889..ad2e339f19e1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,6 +8,7 @@
 name: Release Bundle
 on:
   pull_request:
+  merge_group:
   push:
     branches:
       - 'main'