diff --git a/.github/workflows/pr-test-suite.yml b/.github/workflows/pr-test-suite.yml index d473e2748..816c81606 100644 --- a/.github/workflows/pr-test-suite.yml +++ b/.github/workflows/pr-test-suite.yml @@ -1,5 +1,4 @@ -# We run the test suite on commits to main so codecov gets coverage data -# about the main branch and can use it to track coverage changes. +# We run the test suite on commits to main to double check that everything is good after merging name: PR test suite on: push: @@ -21,13 +20,6 @@ jobs: standard_tests_jobs: name: Standard tests uses: "./.github/workflows/standard_tests_jobs.yml" - with: - # We set this here to avoid coverage data being uploaded from things like our - # nightly pipeline. This is done because codecov (helpfully) keeps track of - # the number of coverage uploads for a commit and displays a warning when - # comparing two commits with an unequal number of uploads. Only uploading - # coverage here should keep the number of uploads it sees consistent. - uploadCoverage: true all_success: name: PR test suite success needs: standard_tests_jobs diff --git a/.github/workflows/standard_tests_jobs.yml b/.github/workflows/standard_tests_jobs.yml index 4f7d4959e..3bfd02ffd 100644 --- a/.github/workflows/standard_tests_jobs.yml +++ b/.github/workflows/standard_tests_jobs.yml @@ -1,12 +1,6 @@ -# Environment variables defined in a calling workflow are not accessible to this reusable workflow. Refer to the documentation for further details on this limitation. name: Standard tests jobs on: workflow_call: - inputs: - uploadCoverage: - description: 'Upload coverage to Codecov' - type: boolean - default: false permissions: contents: read @@ -43,7 +37,6 @@ jobs: PYTHON_VERSION: "${{ matrix.PYTHON_VERSION }}" PIP_USE_PEP517: "${{ matrix.PIP_USE_PEP517 }}" TOXENV: "${{ matrix.TOXENV }}" - uploadCoverage: "${{ inputs.uploadCoverage }}" IMAGE_NAME: "${{ matrix.IMAGE_NAME }}" test_name: "test" test_sphinx_builds: diff --git a/.github/workflows/tox_steps.yml b/.github/workflows/tox_steps.yml index 758327bf2..dce0fcb1b 100644 --- a/.github/workflows/tox_steps.yml +++ b/.github/workflows/tox_steps.yml @@ -10,18 +10,11 @@ on: type: string PIP_USE_PEP517: type: string - uploadCoverage: - description: 'Upload coverage to Codecov' - type: boolean - default: false test_name: type: string permissions: contents: read -env: - uploadCoverage: ${{ inputs.uploadCoverage }} - jobs: tox_all: name: ${{ inputs.test_name }} ${{ inputs.IMAGE_NAME }}-${{ inputs.TOXENV }} @@ -85,26 +78,3 @@ jobs: env python3 -m tox run shell: bash - - name: Upload coverage data - if: env.uploadCoverage == true && (startsWith(matrix.TOXENV, 'cover') || startsWith(matrix.TOXENV, 'integration')) - run: |- - python3 tools/pip_install.py -I coverage - case "${{ runner.os }}" in - Darwin) - CODECOV_URL="https://uploader.codecov.io/latest/macos/codecov" - ;; - Linux) - CODECOV_URL="https://uploader.codecov.io/latest/linux/codecov" - ;; - Windows_NT) - CODECOV_URL="https://uploader.codecov.io/latest/windows/codecov.exe" - ;; - *) - echo "Unexpected OS" - exit 0 - esac - curl --retry 3 -o codecov "$CODECOV_URL" - chmod +x codecov - coverage xml - ./codecov || echo "Uploading coverage data failed" - shell: bash