From 27bb4b1cfd946e61324734104fe2033ba827dbd3 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Fri, 28 Jun 2024 13:35:14 -0500
Subject: [PATCH] Drop codecov-action@v3, enable codecov by default

Cherry-picked from d0949f7f56054ed5f87ae95b98a787e61021e300
---
 .github/workflows/ci.yaml     | 1 +
 .github/workflows/pytest.yaml | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 8b6a2b2..518417a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,6 +14,7 @@ jobs:
       # Choose rosdistro for a canary build. It has ros-infrastructure
       # dependencies and installs scripts, so exercieses a fair amount of the
       # CI action features.
+      codecov: false
       repository: ros-infrastructure/rosdistro
       # Use HEAD to find strategy.json file instead of the tip of
       # ros-infrastructure/ci
diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
index ce3ef84..223f07f 100644
--- a/.github/workflows/pytest.yaml
+++ b/.github/workflows/pytest.yaml
@@ -6,7 +6,7 @@ on:  # yamllint disable-line rule:truthy
     inputs:
       codecov:
         description: 'run codecov action after testing'
-        default: false
+        default: true
         required: false
         type: boolean
       matrix-filter:
@@ -61,9 +61,7 @@ jobs:
           repository: ${{ inputs.setup-repository }}
           path: ./.github-ci-action-repo
       - uses: ./.github-ci-action-repo
-      - uses: codecov/codecov-action@v3
-        if: ${{ inputs.codecov }}
       - uses: codecov/codecov-action@v4
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-        if: ${{ env.CODECOV_TOKEN != '' }}
+        if: ${{ inputs.codecov }}