diff --git a/.github/workflows/python-test-3d.yml b/.github/workflows/python-test-3d.yml index 0b629c2..3599191 100644 --- a/.github/workflows/python-test-3d.yml +++ b/.github/workflows/python-test-3d.yml @@ -4,7 +4,6 @@ name: Tests3D on: - workflow_dispatch: workflow_call: inputs: event_type: @@ -13,6 +12,15 @@ on: action_type: required: true type: string + workflow_dispatch: + push: + branches: [main, dev] + paths: + - 'warmth/warmth3d/**' + pull_request: + branches: [main, dev] + paths: + - 'warmth/warmth3d/**' jobs: build: environment: test3d @@ -21,25 +29,16 @@ 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' && steps.filter3d.outputs.mesh3d == 'true' }} + if: ${{ github.event_name == 'pull_request' && github.event.action == 'opened' }} uses: coroo/pytest-coverage-commentator@v1.0.2 with: pytest-coverage: pytest-coverage.txt diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml index e7e1241..fbd1885 100644 --- a/.github/workflows/python-test.yml +++ b/.github/workflows/python-test.yml @@ -53,10 +53,3 @@ jobs: uses: coroo/pytest-coverage-commentator@v1.0.2 with: pytest-coverage: pytest-coverage.txt - - - test3d: - uses: equinor/warmth/.github/workflows/python-test-3d.yml@main - with: - event_type: ${{ github.event_name}} - action_type: ${{ github.event.action}}