From 00a0846661155fdebafb3a1c0e4c06ac04dff9a2 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Mon, 10 Feb 2025 13:37:28 -0800 Subject: [PATCH] Prepare CI for merge queue --- .github/workflows/check-nix-format.yml | 1 + .github/workflows/pr.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index a814917bb..2d735ee9c 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -6,6 +6,7 @@ name: Check that Nix files are formatted on: pull_request: types: [opened, synchronize, reopened] + merge_group: permissions: contents: read diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 08b6196a7..df5e23339 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,6 +1,7 @@ name: "Test" on: pull_request: + merge_group: # For bors push: branches: