From d69b572ce53452989ee7647122864f6777426043 Mon Sep 17 00:00:00 2001
From: Mike Jarvis <michael@jarvis.net>
Date: Sat, 15 Jul 2023 21:53:33 -0400
Subject: [PATCH] Switch to new codecov uploader

---
 .github/workflows/ci.yml | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ae759fcb88..31863c1b1f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -181,6 +181,8 @@ jobs:
                 cd tests
                 coverage run -m pytest -v
                 pytest -v run_examples.py
+                coverage combine
+                coverage xml
                 cd ..  # N.B. This seems to happen automatically if omitted.
                        # Less confusing to include it explicitly.
 
@@ -209,18 +211,12 @@ jobs:
 
             - name: Upload coverage to codecov
               if: matrix.py != 'pypy-3.7'
-              run: |
-                cd tests
-                pwd -P
-                ls -la
-                coverage combine || true  # (Not necessary I think, but just in case.)
-                coverage report
-                ls -la
-                #codecov  # This didn't work.
-                # cf. https://community.codecov.io/t/github-not-getting-codecov-report-after-switching-from-travis-to-github-actions-for-ci/
-                # The solution was to switch to the bash uploader line instead.
-                bash <(curl -s https://codecov.io/bash)
-                cd ..
+              uses: codecov/codecov-action@v3
+              with:
+                token: ${{ secrets.CODECOV_TOKEN }}
+                files: tests/coverage.xml
+                fail_ci_if_error: false
+                verbose: true
 
             - name: Pre-cache cleanup
               continue-on-error: true