Merge pull request #9 from equinor/subsheat3D/test_from_grids

TST: refactor CI

.github/workflows/build_docker.yml

@@ -35,8 +35,8 @@ jobs:
       name: Build
       uses: docker/build-push-action@v2
       with:
-        file: .devcontainer/Dockerfile
-        context: .
+        file: Dockerfile
+        context: .devcontainer
         push: true
         platforms: linux/amd64
         tags: ghcr.io/equinor/warmth:latest

.github/workflows/python-test.yml

@@ -46,28 +46,27 @@ jobs:
 
       - name: Test with pytest
         run: |
-          poetry run pytest --cov-report=term-missing --ignore=tests/3d --cov=warmth tests/ | tee pytest-coverage.txt
+          poetry run pytest --cov-report=term-missing --ignore=tests/warmth3d --cov=warmth tests/ | tee pytest-coverage.txt
 
       - name: Comment coverage
         if: ${{ github.event_name == 'pull_request' && github.event.action == 'opened' }}
         uses: coroo/[email protected]
         with:
           pytest-coverage: pytest-coverage.txt
 
-      - name: check_3d_modified
-        uses: dorny/paths-filter@v2
-        id: filter3d
-        with:
-          filters: |
-            mesh3d:
-              - 'warmth/3d/**'
-    outputs:
-      filter3d: ${{ steps.filter3d.outputs.mesh3d }}
 
   test3d:
-    needs: [build]
-    uses: equinor/warmth/.github/workflows/python-test-3d.yml@main
-    if: ${{ needs.build.outputs.filter3d }} == 'true'
-    with:
-      event_type: ${{ github.event_name}}
-      action_type: ${{ github.event.action}}
+    runs-on: ubuntu-latest
+    steps:
+    - name: check_3d_modified
+      uses: dorny/paths-filter@v2
+      id: filter3d
+      with:
+        filters: |
+          mesh3d:
+            - 'warmth/3d/**'
+    - 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}}

.github/workflows/snyk.yml

@@ -1,9 +1,5 @@
 name: Snyk scan
 on: 
-    push:
-        branches: [main, dev]
-    pull_request:
-        branches: [main, dev]
     workflow_call:
 jobs:
   security: