Fix merge conflict

tundranerd · Feb 29, 2024 · ea590c2 · ea590c2
1 parent 1fbf807
commit ea590c2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -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