From 28cf0fb592e4d0f30a1a900da4c7f38c5a2d5e4b Mon Sep 17 00:00:00 2001 From: Jan Vollmer Date: Sat, 6 Jan 2024 02:17:52 +0100 Subject: [PATCH] merge coverages --- .github/workflows/coverage.yaml | 24 ------------------------ .github/workflows/test.yaml | 6 +++++- noxfile.py | 2 +- 3 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 .github/workflows/coverage.yaml diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml deleted file mode 100644 index 01f4cba..0000000 --- a/.github/workflows/coverage.yaml +++ /dev/null @@ -1,24 +0,0 @@ -name: Coverage - -on: - push: - branches: [dev] - pull_request: - branches: [dev] - -jobs: - Test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Setup PDM - uses: pdm-project/setup-pdm@v3 - with: - python-version: "3.10" - cache: true - - name: Install dependencies - run: pdm install --no-lock - - name: Run tests - run: pdm coverage - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 24e835e..2347bf0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -25,7 +25,9 @@ jobs: - name: Install dependencies run: pdm install --no-lock - name: Run tests - run: pdm test + run: pdm coverage + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v3 Test20: name: Test SA 2.0 runs-on: ubuntu-latest @@ -44,3 +46,5 @@ jobs: run: pip install nox - name: Run tests run: pdm test_20 + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v3 diff --git a/noxfile.py b/noxfile.py index e5e23f1..716adf4 100644 --- a/noxfile.py +++ b/noxfile.py @@ -15,5 +15,5 @@ def tests(session: nox.Session): def tests_20(session: nox.Session): session.run_always("pdm", "install", "--no-lock", external=True) session.install("sqlalchemy>2.0") - session.run("pytest") + session.run("pdm", "coverage") session.install("sqlalchemy<2.0")