From 89f740a4988c87d0d70c3a56241d76842b420c3e Mon Sep 17 00:00:00 2001 From: Noon van der Silk Date: Fri, 27 Sep 2024 12:25:32 +0100 Subject: [PATCH 1/2] Run CI on merge queue things --- .github/workflows/ci-nix.yaml | 3 ++- .github/workflows/network-test.yaml | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-nix.yaml b/.github/workflows/ci-nix.yaml index c37ab773663..6c1f93beeb3 100644 --- a/.github/workflows/ci-nix.yaml +++ b/.github/workflows/ci-nix.yaml @@ -4,8 +4,9 @@ name: "CI" concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true - on: + # We're using merge-chains; so this needs to run then. + merge_group: push: branches: - master diff --git a/.github/workflows/network-test.yaml b/.github/workflows/network-test.yaml index e058674adce..8dfc617c270 100644 --- a/.github/workflows/network-test.yaml +++ b/.github/workflows/network-test.yaml @@ -1,6 +1,8 @@ name: "Network fault tolerance" on: + # We're using merge-chains; so this needs to run then. + merge_group: push: branches: - master From 5e318a7267d2055f7596cc11448e380a1206752b Mon Sep 17 00:00:00 2001 From: Noon van der Silk Date: Fri, 27 Sep 2024 13:09:52 +0100 Subject: [PATCH 2/2] Formatting needs it too --- .github/workflows/formatting.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/formatting.yaml b/.github/workflows/formatting.yaml index 6110620cf73..9f4ecd6d28d 100644 --- a/.github/workflows/formatting.yaml +++ b/.github/workflows/formatting.yaml @@ -1,6 +1,8 @@ name: Check code formatting on: + # We're using merge-chains; so this needs to run then. + merge_group: pull_request: jobs: