From 8762c10aaebc0344b56ab78756e1f3ed8df77b44 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 28 Mar 2025 11:06:22 -0400
Subject: [PATCH] Move the if evaluation of the test jobs onthe tests job
 itself, so we can skip it properly in PRs and block on it in merge groups

---
 .github/workflows/ci.yml   | 6 +++---
 .github/workflows/test.yml | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fc7f491d8..7c1ef3cda 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -59,26 +59,26 @@ jobs:
       system: x86_64-linux
 
   test_aarch64-linux:
-    if: github.event_name == 'merge_group'
     uses: ./.github/workflows/test.yml
     needs: build_aarch64-linux
     with:
+      if: github.event_name == 'merge_group'
       os: blacksmith-32vcpu-ubuntu-2204-arm
       system: aarch64-linux
 
   test_x86_64-darwin:
-    if: github.event_name == 'merge_group'
     uses: ./.github/workflows/test.yml
     needs: build_x86_64-darwin
     with:
+      if: github.event_name == 'merge_group'
       os: macos-latest-large
       system: x86_64-darwin
 
   test_aarch64-darwin:
-    if: github.event_name == 'merge_group'
     uses: ./.github/workflows/test.yml
     needs: build_aarch64-darwin
     with:
+      if: github.event_name == 'merge_group'
       os: macos-latest-xlarge
       system: aarch64-darwin
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a54b1f839..49af88020 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,8 +7,13 @@ on:
       system:
         required: true
         type: string
+      if:
+        required: false
+        default: true
+        type: boolean
 jobs:
   tests:
+    if: ${{ inputs.if }}
     strategy:
       fail-fast: false
     runs-on: ${{ inputs.os }}