From f3b4041e2d27bd425e5f39cd255d0cd5460e7678 Mon Sep 17 00:00:00 2001
From: Jason Gross <jgross@mit.edu>
Date: Tue, 7 Nov 2023 12:57:59 -0800
Subject: [PATCH] [CI] Add `merge_group:` trigger for merge queue (#1706)

As per
https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue#triggering-merge-group-checks-with-github-actions
this will allow us to enable merge queues in
https://github.com/mit-plv/fiat-crypto/settings/branch_protection_rules/3303819
---
 .github/workflows/c.yml           | 1 +
 .github/workflows/coq-debian.yml  | 3 ++-
 .github/workflows/coq-macos.yml   | 1 +
 .github/workflows/coq-windows.yml | 1 +
 .github/workflows/docker-coq.yml  | 3 ++-
 .github/workflows/go.yml          | 1 +
 .github/workflows/java.yml        | 1 +
 .github/workflows/json.yml        | 1 +
 .github/workflows/rust.yml        | 1 +
 .github/workflows/zig.yml         | 1 +
 10 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/c.yml b/.github/workflows/c.yml
index 5636ebae1b..43b5684f76 100644
--- a/.github/workflows/c.yml
+++ b/.github/workflows/c.yml
@@ -3,6 +3,7 @@ name: Test Generated C
 on:
   push:
   pull_request:
+  merge_group:
   schedule:
     - cron: '0 0 1 * *'
 
diff --git a/.github/workflows/coq-debian.yml b/.github/workflows/coq-debian.yml
index 009902a3df..2c71c9950a 100644
--- a/.github/workflows/coq-debian.yml
+++ b/.github/workflows/coq-debian.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches: [ master , sp2019latest ]
   pull_request:
+  merge_group:
   workflow_dispatch:
   schedule:
     - cron: '0 0 1 * *'
@@ -101,5 +102,5 @@ jobs:
     - name: make only-test-amd64-files
       shell: in-debian-chroot.sh {0}
       run: etc/ci/github-actions-make.sh -j2 only-test-amd64-files SLOWEST_FIRST=1
-      env: 
+      env:
         ALLOW_DIFF: 1
diff --git a/.github/workflows/coq-macos.yml b/.github/workflows/coq-macos.yml
index aebadf42e9..eddb87fd4a 100644
--- a/.github/workflows/coq-macos.yml
+++ b/.github/workflows/coq-macos.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches: [ master , sp2019latest , v8.6 , v8.8 , v8.10 ]
   pull_request:
+  merge_group:
   workflow_dispatch:
   schedule:
     - cron: '0 0 1 * *'
diff --git a/.github/workflows/coq-windows.yml b/.github/workflows/coq-windows.yml
index 375c593c26..005728244c 100644
--- a/.github/workflows/coq-windows.yml
+++ b/.github/workflows/coq-windows.yml
@@ -7,6 +7,7 @@ on:
   push:
     branches: [ master , sp2019latest , v8.6 , v8.8 , v8.10 ]
   pull_request:
+  merge_group:
   workflow_dispatch:
   schedule:
     - cron: '0 0 1 * *'
diff --git a/.github/workflows/docker-coq.yml b/.github/workflows/docker-coq.yml
index c2731cfcae..1818e0db0e 100644
--- a/.github/workflows/docker-coq.yml
+++ b/.github/workflows/docker-coq.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches: [ master , sp2019latest , v8.6 , v8.8 , v8.10 ]
   pull_request:
+  merge_group:
   workflow_dispatch:
   schedule:
     - cron: '0 0 1 * *'
@@ -121,5 +122,5 @@ jobs:
       run: chmod +x src/ExtractionOCaml/*
     - name: only-test-amd64-files
       run: etc/ci/github-actions-make.sh -f Makefile.examples -j2 only-test-amd64-files SLOWEST_FIRST=1
-      env: 
+      env:
         ALLOW_DIFF: 1
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 66dfb8fa35..c4d9080dd2 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -3,6 +3,7 @@ name: Test Generated Go
 on:
   push:
   pull_request:
+  merge_group:
   schedule:
     - cron: '0 0 1 * *'
 
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index 4bae0f9388..8dfac4184f 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -3,6 +3,7 @@ name: Test Generated Java
 on:
   push:
   pull_request:
+  merge_group:
   schedule:
     - cron: '0 0 1 * *'
 
diff --git a/.github/workflows/json.yml b/.github/workflows/json.yml
index 1df3b0dd39..5d0c8dc1d5 100644
--- a/.github/workflows/json.yml
+++ b/.github/workflows/json.yml
@@ -3,6 +3,7 @@ name: Test Generated JSON
 on:
   push:
   pull_request:
+  merge_group:
   schedule:
     - cron: '0 0 1 * *'
 
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index dc22701279..d3295c272d 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -3,6 +3,7 @@ name: Test Generated Rust
 on:
   push:
   pull_request:
+  merge_group:
   schedule:
     - cron: '0 0 1 * *'
 
diff --git a/.github/workflows/zig.yml b/.github/workflows/zig.yml
index d620cb0555..d4c94fb7dc 100644
--- a/.github/workflows/zig.yml
+++ b/.github/workflows/zig.yml
@@ -3,6 +3,7 @@ name: Test Generated Zig
 on:
   push:
   pull_request:
+  merge_group:
   schedule:
     - cron: "0 0 1 * *"