diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6ad45cb2015..af7035837e2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -40,7 +40,7 @@ concurrency: jobs: tests: - name: ${{ matrix.continuum }} continuum ${{ matrix.rpacket_tracking }} rpacket_tracking ${{ matrix.os }} ${{ inputs.pip_git && 'pip tests enabled' || '' }} + name: ${{ matrix.continuum }} continuum ${{ matrix.os }} ${{ inputs.pip_git && 'pip tests enabled' || '' }} if: github.repository_owner == 'tardis-sn' runs-on: ${{ matrix.os }} strategy: @@ -48,10 +48,6 @@ jobs: matrix: label: [osx-arm64, linux-64] continuum: ['not', ''] - rpacket_tracking: ['not', ''] - exclude: - - continuum: '' - rpacket_tracking: '' include: - label: osx-arm64 os: macos-latest @@ -82,17 +78,17 @@ jobs: pip install git+https://github.com/tardis-sn/tardis.git@master - name: Run tests - run: pytest tardis ${{ env.PYTEST_FLAGS }} -m "${{ matrix.continuum }} continuum and ${{ matrix.rpacket_tracking }} rpacket_tracking" + run: pytest tardis ${{ env.PYTEST_FLAGS }} -m "${{ matrix.continuum }} continuum" - name: Refdata Generation tests - run: pytest tardis ${{ env.PYTEST_FLAGS }} --generate-reference -m "${{ matrix.continuum }} continuum and ${{ matrix.rpacket_tracking }} rpacket_tracking" + run: pytest tardis ${{ env.PYTEST_FLAGS }} --generate-reference -m "${{ matrix.continuum }} continuum" if: contains(github.event.pull_request.labels.*.name, 'run-generation-tests') || github.ref == 'refs/heads/master' - run: mv .coverage .coverage.${{ strategy.job-index }} - uses: actions/upload-artifact@v4 with: - name: coverage-${{ matrix.continuum }}-continuum-${{ matrix.rpacket_tracking }}-rpacket_tracking-${{ matrix.os }} + name: coverage-${{ matrix.continuum }}-continuum-${{ matrix.os }} path: | .coverage* !.coveragerc