TST: fix CI

equinor · Nov 22, 2023 · c4ca939 · c4ca939
1 parent 078c9a0
commit c4ca939
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/.github/workflows/python-test-3d.yml b/.github/workflows/python-test-3d.yml
@@ -21,16 +21,25 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: check_3d_modified
+      uses: dorny/paths-filter@v2
+      id: filter3d
+      with:
+        filters: |
+          mesh3d:
+            - 'warmth/warmth3d/**'
+      
     - name: Run
       uses: tj-actions/docker-run@v2
+      if: ${{ steps.filter3d.outputs.mesh3d }} == 'true'
       with:
         image: ghcr.io/equinor/warmth:latest
         name: dolfinx
         options: -v ${{ github.workspace }}:/home/warmth
 
 
     - name: Comment coverage
-      if: ${{ github.event_name == 'pull_request' && github.event.action == 'opened' }}
+      if: ${{ github.event_name == 'pull_request' && github.event.action == 'opened' && steps.filter3d.outputs.mesh3d == 'true' }}
       uses: coroo/[email protected]
       with:
         pytest-coverage: pytest-coverage.txt
diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml
@@ -56,17 +56,7 @@ jobs:
 
 
   test3d:
-    runs-on: ubuntu-latest
-    steps:
-    - name: check_3d_modified
-      uses: dorny/paths-filter@v2
-      id: filter3d
-      with:
-        filters: |
-          mesh3d:
-            - 'warmth/warmth3d/**'
-    - uses: equinor/warmth/.github/workflows/python-test-3d.yml@main
-      if: ${{ steps.filter3d.outputs.mesh3d }} == 'true'
-      with:
-        event_type: ${{ github.event_name}}
-        action_type: ${{ github.event.action}}
+    uses: equinor/warmth/.github/workflows/python-test-3d.yml@main
+    with:
+      event_type: ${{ github.event_name}}
+      action_type: ${{ github.event.action}}