From ea590c2c13a70831df8ae69900654059698340e7 Mon Sep 17 00:00:00 2001
From: John Haynes <tundranerd@gmail.com>
Date: Wed, 28 Feb 2024 20:59:39 -0700
Subject: [PATCH] Fix merge conflict

---
 .github/workflows/linux.yml | 5 +----
 .github/workflows/macos.yml | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 8d985a6f0..043c5c884 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -1,5 +1,4 @@
 name: CI - Linux
-
 on:
   pull_request:
     types:
@@ -18,16 +17,14 @@ on:
         required: false
         type: boolean
         default: false
-
 permissions:
   id-token: write # This is required for requesting the JWT
   contents: read  # This is required for actions/checkout
-
 jobs:
   call_workflow:
     uses: tundranerd/febio-workflows/.github/workflows/linux-reusable.yml@develop
     with:
-      runTests: ${{ inputs.runTests && true || false }}
+      runTests: ${{ inputs.runTests == 'true' || github.event_name == 'pull_request' }}
       package-name: febio4
       package-sdk: true
       aws-ami-id: ami-0590ebdb5afffb782
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 09b973ff5..fd6bdae09 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -16,11 +16,9 @@ on:
         description: "Run tests?"
         required: false
         default: false
-
 permissions:
   id-token: write # This is required for requesting the JWT
   contents: read  # This is required for actions/checkout
-
 jobs:
   call_workflow:
     uses: tundranerd/febio-workflows/.github/workflows/macos-reusable.yml@develop