From 4c540a6418b769e4c6df9bfe5d319e213dce8685 Mon Sep 17 00:00:00 2001
From: Martin Robinson <mrobinson@igalia.com>
Date: Mon, 10 Jul 2023 13:42:38 +0200
Subject: [PATCH] Enable the GitHub merge queue

---
 .github/workflows/ci.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f99d2e9..a4615f2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,9 +1,11 @@
-name: Run CI
+name: CI
 on:
   push:
-    branches: ["auto"]
+    branches: ["master"]
   pull_request:
     branches: ["**"]
+  merge_group:
+    types: [checks_requested]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -14,7 +16,7 @@ env:
 
 jobs:
   ci:
-    name: Run CI
+    name: Build and Test
     runs-on: ubuntu-latest
 
     strategy:
@@ -35,8 +37,10 @@ jobs:
         run: |
           cargo build --no-default-features
           cargo build
-      - name: Tests
-        run: cargo test --all
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --all
       - name: Build codegen
         run: |
           cd string-cache-codegen && cargo build && cd ..
@@ -47,7 +51,7 @@ jobs:
 
 
   build_result:
-    name: homu build finished
+    name: Result
     runs-on: ubuntu-latest
     needs:
       - "ci"