From 5c042addbd1eeb7cf0d40def2439f588768c7378 Mon Sep 17 00:00:00 2001 From: "mPanda.Red" Date: Thu, 14 Oct 2021 22:03:41 -0400 Subject: [PATCH 1/5] Use the CodeCov GitHub Action instead of the Bash Uploader --- .github/workflows/main.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f00f02f437f..3091524384c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -169,7 +169,13 @@ jobs: if: matrix.use_coverage && github.repository == 'pytest-dev/pytest' env: CODECOV_NAME: ${{ matrix.name }} - run: bash scripts/upload-coverage.sh -F GHA,${{ runner.os }} + uses: codecov/codecov-action@v2 + with: + files: ./coverage1.xml + fail_ci_if_error: true + env_vars: OS,PYTHON + name: pytest-codecov + verbose: true linting: runs-on: ubuntu-latest From 696045b7cfe65508d4570ae51ad39e4e90890ef3 Mon Sep 17 00:00:00 2001 From: "mPanda.Red" Date: Thu, 14 Oct 2021 22:17:25 -0400 Subject: [PATCH 2/5] Use the proper name for Codecov --- .github/workflows/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3091524384c..02e36b6127c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -167,14 +167,12 @@ jobs: - name: Upload coverage if: matrix.use_coverage && github.repository == 'pytest-dev/pytest' - env: - CODECOV_NAME: ${{ matrix.name }} uses: codecov/codecov-action@v2 with: files: ./coverage1.xml fail_ci_if_error: true env_vars: OS,PYTHON - name: pytest-codecov + name: ${{ matrix.name }} verbose: true linting: From a6e0a683ab36b34fef1e2c8a50a75594413017db Mon Sep 17 00:00:00 2001 From: "mPanda.Red" Date: Thu, 14 Oct 2021 22:24:51 -0400 Subject: [PATCH 3/5] Use the correct .coverage.xml file --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 02e36b6127c..56e6e3ea1de 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -169,7 +169,7 @@ jobs: if: matrix.use_coverage && github.repository == 'pytest-dev/pytest' uses: codecov/codecov-action@v2 with: - files: ./coverage1.xml + files: ./coverage.xml fail_ci_if_error: true env_vars: OS,PYTHON name: ${{ matrix.name }} From c4b26204bbf9d15728dda4d1e10c754fd3169f51 Mon Sep 17 00:00:00 2001 From: "mPanda.Red" Date: Thu, 14 Oct 2021 22:28:32 -0400 Subject: [PATCH 4/5] it's just .coverage not .coverage.xml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 56e6e3ea1de..298b08175a8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -169,7 +169,7 @@ jobs: if: matrix.use_coverage && github.repository == 'pytest-dev/pytest' uses: codecov/codecov-action@v2 with: - files: ./coverage.xml + files: ./.coverage fail_ci_if_error: true env_vars: OS,PYTHON name: ${{ matrix.name }} From f606a3b08dbf0783eb114735ae55ebd57f0282bc Mon Sep 17 00:00:00 2001 From: "mPanda.Red" Date: Sun, 17 Oct 2021 22:00:45 -0400 Subject: [PATCH 5/5] Re-add the coverage.xml file --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 298b08175a8..f8e00a71c81 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -169,7 +169,7 @@ jobs: if: matrix.use_coverage && github.repository == 'pytest-dev/pytest' uses: codecov/codecov-action@v2 with: - files: ./.coverage + files: ./.coverage,./coverage.xml fail_ci_if_error: true env_vars: OS,PYTHON name: ${{ matrix.name }}