diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/ci.yml similarity index 55% rename from .github/workflows/unit-tests.yml rename to .github/workflows/ci.yml index 530bf1030..53b63a2f6 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: unit-tests +name: ci on: push: branches: @@ -16,7 +16,7 @@ defaults: jobs: unit-test: - name: Unittesting on ${{ matrix.os }} with python ${{ matrix.python-version }} + name: unit tests | ${{ matrix.os }} | py${{ matrix.python-version }} runs-on: ${{ matrix.os }}-latest strategy: fail-fast: false @@ -50,3 +50,31 @@ jobs: with: name: Unittest report path: ${{ matrix.os }}_${{ matrix.python-version }}_unit_test_report.html + integration-test: + name: integration tests | ${{ matrix.os }} + runs-on: ${{ matrix.os }}-latest + strategy: + fail-fast: false + matrix: + os: [macos, ubuntu, windows] + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Setup Conda and parcels + uses: ./.github/actions/install-parcels + with: + environment-file: environment.yml + - name: Integration test + run: | + coverage run -m pytest -v -s --nbval-lax -k "not documentation" --html="${{ matrix.os }}_integration_test_report.html" --self-contained-html docs/examples + coverage xml + - name: Codecov + uses: codecov/codecov-action@v3.1.1 + with: + flags: integration-tests + - name: Upload test results + if: ${{ always() }} # Always run this step, even if tests fail + uses: actions/upload-artifact@v3.1.2 + with: + name: Integration test report + path: ${{ matrix.os }}_integration_test_report.html diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml deleted file mode 100644 index 8aeee419c..000000000 --- a/.github/workflows/integration-tests.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: integration-tests -on: - push: - branches: - - "master" - - "test-me/*" - pull_request: - branches: - - "*" - schedule: - - cron: "0 7 * * 1" # Run every Monday at 7:00 UTC - -defaults: - run: - shell: bash -el {0} - -jobs: - integration-test: - name: ${{ matrix.os }} integration tests - runs-on: ${{ matrix.os }}-latest - strategy: - fail-fast: false - matrix: - os: [macos, ubuntu, windows] - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Setup Conda and parcels - uses: ./.github/actions/install-parcels - with: - environment-file: environment.yml - - name: Integration test - run: | - coverage run -m pytest -v -s --nbval-lax -k "not documentation" --html="${{ matrix.os }}_integration_test_report.html" --self-contained-html docs/examples - coverage xml - - name: Codecov - uses: codecov/codecov-action@v3.1.1 - with: - flags: integration-tests - - name: Upload test results - if: ${{ always() }} # Always run this step, even if tests fail - uses: actions/upload-artifact@v3.1.2 - with: - name: Integration test report - path: ${{ matrix.os }}_integration_test_report.html