From 22ac95a588d49bb4e8a83d5f3db76c2738bdc0a6 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Tue, 24 Dec 2019 19:11:46 +1100
Subject: [PATCH] Keep codecov-action

---
 .github/workflows/test-windows.yml | 19 ++++++++-----------
 .github/workflows/test.yml         | 17 ++++++++---------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 0f05d7b1c..e97db30c4 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -364,19 +364,16 @@ jobs:
         name: errors
         path: Tests/errors
 
+    - name: Prepare coverage token
+      if: success() && github.repository == 'python-pillow/Pillow'
+      run: cp .github/codecov-upstream.yml .codecov.yml
+
     - name: Upload coverage
       if: success()
-      run: |
-        if [ "$GITHUB_REPOSITORY" == "python-pillow/Pillow" ]; then
-          echo "CI on python-pillow/Pillow, copy CodeCov settings"
-          cp .github/codecov-upstream.yml .codecov.yml
-        fi
-        echo Upload coverage
-        curl -s https://codecov.io/bash | bash
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-        CODECOV_NAME: ${{ runner.os }} Python ${{ matrix.python-version }}
-      shell: bash
+      uses: codecov/codecov-action@v1
+      with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          name: ${{ runner.os }} Python ${{ matrix.python-version }}
 
     - name: Build wheel
       id: wheel
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f98763e85..94836fb52 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -97,14 +97,13 @@ jobs:
         MATRIX_OS: ${{ matrix.os }}
         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
 
+    - name: Prepare coverage token
+      if: success() && github.repository == 'python-pillow/Pillow'
+      run: cp .github/codecov-upstream.yml .codecov.yml
+
     - name: Upload coverage
       if: success()
-      run: |
-        if [ "$GITHUB_REPOSITORY" == "python-pillow/Pillow" ]; then
-          echo "CI on python-pillow/Pillow, copy CodeCov settings"
-          cp .github/codecov-upstream.yml .codecov.yml
-        fi
-        bash <(curl -s https://codecov.io/bash)
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-        CODECOV_NAME: ${{ matrix.os }} Python ${{ matrix.python-version }}
+      uses: codecov/codecov-action@v1
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        name: ${{ matrix.os }} Python ${{ matrix.python-version }}