From 6d9861cf4a27415719004641b54292c570919418 Mon Sep 17 00:00:00 2001 From: Glyph Date: Wed, 15 Jun 2022 17:35:10 -0700 Subject: [PATCH 1/4] is it this simple? --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91e4f2e..705445c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,3 +33,5 @@ jobs: if [[ -n "${TOX_ENV}" ]]; then tox -e "$TOX_ENV"; fi + - name: Upload coverage report + uses: codecov/codecov-action@v3.1.0 From 159e712243e656591a6397d61b10faa543670726 Mon Sep 17 00:00:00 2001 From: Glyph Date: Wed, 15 Jun 2022 17:41:19 -0700 Subject: [PATCH 2/4] fix --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 705445c..eb4ec3a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,6 +32,10 @@ jobs: echo "Starting: ${TOX_ENV} ${PUSH_DOCS}" if [[ -n "${TOX_ENV}" ]]; then tox -e "$TOX_ENV"; - fi + if [[ "${TOX_ENV}" != "mypy" ]]; then + tox -e coverage-combine; + fi; + fi; - name: Upload coverage report + if: ${{ matrix.TOX_ENV != 'mypy' }} uses: codecov/codecov-action@v3.1.0 From 71bccd1e8c561c7df5a20d5da38b7a5eefdf575e Mon Sep 17 00:00:00 2001 From: Glyph Date: Wed, 15 Jun 2022 17:45:27 -0700 Subject: [PATCH 3/4] ahem --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb4ec3a..2fee324 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: if [[ -n "${TOX_ENV}" ]]; then tox -e "$TOX_ENV"; if [[ "${TOX_ENV}" != "mypy" ]]; then - tox -e coverage-combine; + tox -e coverage-report; fi; fi; - name: Upload coverage report From 60c8f676c6167f5497c27158afc6546459fcd006 Mon Sep 17 00:00:00 2001 From: Glyph Date: Wed, 15 Jun 2022 17:49:58 -0700 Subject: [PATCH 4/4] xml? --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 82ac4e1..40b6129 100644 --- a/tox.ini +++ b/tox.ini @@ -24,6 +24,7 @@ deps = coverage skip_install = true commands = coverage combine + coverage xml coverage report -m depends = {pypy3,py38,py310}-{extras,noextras}