From ccf40465ff6d84ceef53a569c692f99d0a7d45b3 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 17 Sep 2023 15:50:25 +0100 Subject: [PATCH] Tokenless coverage uploads are not supported by the codecov-cli tool Signed-off-by: Pedro Algarvio --- .codecov.yml | 8 ++-- .github/workflows/ci.yml | 46 ------------------- .github/workflows/nightly.yml | 46 ------------------- .github/workflows/scheduled.yml | 46 ------------------- .github/workflows/staging.yml | 39 ---------------- .github/workflows/templates/ci.yml.jinja | 4 ++ .github/workflows/templates/layout.yml.jinja | 4 ++ .../workflows/templates/test-salt.yml.jinja | 3 -- .github/workflows/test-action-macos.yml | 35 ++++++++++---- .github/workflows/test-action.yml | 35 ++++++++++---- .../test-package-downloads-action-linux.yml | 35 ++++++++++---- .../test-package-downloads-action-macos.yml | 35 ++++++++++---- .../test-package-downloads-action-windows.yml | 35 ++++++++++---- 13 files changed, 142 insertions(+), 229 deletions(-) diff --git a/.codecov.yml b/.codecov.yml index 0f57a7a304f..a7a94a5363f 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -9,7 +9,7 @@ codecov: notify: wait_for_ci: false # Should Codecov wait for all CI statuses to complete before sending ours. # Note: Codecov considers all non-codecov statuses to be CI statuses - manual_trigger: true # We manually tell codecov to merge and process all uploaded coverage reports +# manual_trigger: true # We manually tell codecov to merge and process all uploaded coverage reports ignore: @@ -86,9 +86,9 @@ flags: - tests/pytests/integration carryforward: true -comment: - layout: "header, diff, flags, files" - behavior: default # Comment posting behaviour +comment: off +# layout: "header, diff, flags, files" +# behavior: default # Comment posting behaviour # default: update, if exists. Otherwise post new. # once: update, if exists. Otherwise post new. Skip if deleted. # new: delete old and post new. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f00c133fa11..8ec7ce96d5e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -239,22 +239,7 @@ jobs: name: testrun-changed-files.txt path: testrun-changed-files.txt - - name: Install Codecov CLI - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - python3 -m pip install codecov-cli - - name: Save Commit Metadata In Codecov - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - create-commit --git-service github --sha ${{ github.sha }} - - - name: Create Codecov Coverage Report - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - create-report --git-service github --sha ${{ github.sha }} pre-commit: name: Pre-Commit if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} @@ -1667,7 +1652,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit windows-2019: name: Windows 2019 @@ -1688,7 +1672,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit windows-2022: name: Windows 2022 @@ -1709,7 +1692,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit macos-12: name: macOS 12 @@ -1730,7 +1712,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit almalinux-8: name: Alma Linux 8 @@ -1751,7 +1732,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit almalinux-9: name: Alma Linux 9 @@ -1772,7 +1752,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit amazonlinux-2: name: Amazon Linux 2 @@ -1793,7 +1772,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit archlinux-lts: name: Arch Linux LTS @@ -1814,7 +1792,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit centos-7: name: CentOS 7 @@ -1835,7 +1812,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit centosstream-8: name: CentOS Stream 8 @@ -1856,7 +1832,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit centosstream-9: name: CentOS Stream 9 @@ -1877,7 +1852,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit debian-10: name: Debian 10 @@ -1898,7 +1872,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit debian-11: name: Debian 11 @@ -1919,7 +1892,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit debian-11-arm64: name: Debian 11 Arm64 @@ -1940,7 +1912,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit fedora-37: name: Fedora 37 @@ -1961,7 +1932,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit fedora-38: name: Fedora 38 @@ -1982,7 +1952,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit opensuse-15: name: Opensuse 15 @@ -2003,7 +1972,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit photonos-3: name: Photon OS 3 @@ -2024,7 +1992,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit photonos-4: name: Photon OS 4 @@ -2045,7 +2012,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit photonos-4-arm64: name: Photon OS 4 Arm64 @@ -2066,7 +2032,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit ubuntu-2004: name: Ubuntu 20.04 @@ -2087,7 +2052,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit ubuntu-2004-arm64: name: Ubuntu 20.04 Arm64 @@ -2108,7 +2072,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit ubuntu-2204: name: Ubuntu 22.04 @@ -2129,7 +2092,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit ubuntu-2204-arm64: name: Ubuntu 22.04 Arm64 @@ -2150,7 +2112,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} - secrets: inherit combine-all-code-coverage: name: Combine Code Coverage @@ -2227,14 +2188,7 @@ jobs: run: | python3 -m pip install 'nox==2022.8.7' - - name: Install Codecov CLI - run: | - python3 -m pip install codecov-cli - - name: Tell Codecov To Process Reports - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - send-notifications --git-service github --sha ${{ github.sha }} - name: Get coverage reports id: get-coverage-reports diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7e96d50cdc1..ebd0e46c3ec 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -283,22 +283,7 @@ jobs: name: testrun-changed-files.txt path: testrun-changed-files.txt - - name: Install Codecov CLI - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - python3 -m pip install codecov-cli - - name: Save Commit Metadata In Codecov - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - create-commit --git-service github --sha ${{ github.sha }} - - - name: Create Codecov Coverage Report - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - create-report --git-service github --sha ${{ github.sha }} pre-commit: name: Pre-Commit if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} @@ -1728,7 +1713,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit windows-2019: name: Windows 2019 @@ -1749,7 +1733,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit windows-2022: name: Windows 2022 @@ -1770,7 +1753,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit macos-12: name: macOS 12 @@ -1791,7 +1773,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit almalinux-8: name: Alma Linux 8 @@ -1812,7 +1793,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit almalinux-9: name: Alma Linux 9 @@ -1833,7 +1813,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit amazonlinux-2: name: Amazon Linux 2 @@ -1854,7 +1833,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit archlinux-lts: name: Arch Linux LTS @@ -1875,7 +1853,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit centos-7: name: CentOS 7 @@ -1896,7 +1873,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit centosstream-8: name: CentOS Stream 8 @@ -1917,7 +1893,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit centosstream-9: name: CentOS Stream 9 @@ -1938,7 +1913,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit debian-10: name: Debian 10 @@ -1959,7 +1933,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit debian-11: name: Debian 11 @@ -1980,7 +1953,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit debian-11-arm64: name: Debian 11 Arm64 @@ -2001,7 +1973,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit fedora-37: name: Fedora 37 @@ -2022,7 +1993,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit fedora-38: name: Fedora 38 @@ -2043,7 +2013,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit opensuse-15: name: Opensuse 15 @@ -2064,7 +2033,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit photonos-3: name: Photon OS 3 @@ -2085,7 +2053,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit photonos-4: name: Photon OS 4 @@ -2106,7 +2073,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit photonos-4-arm64: name: Photon OS 4 Arm64 @@ -2127,7 +2093,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit ubuntu-2004: name: Ubuntu 20.04 @@ -2148,7 +2113,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit ubuntu-2004-arm64: name: Ubuntu 20.04 Arm64 @@ -2169,7 +2133,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit ubuntu-2204: name: Ubuntu 22.04 @@ -2190,7 +2153,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit ubuntu-2204-arm64: name: Ubuntu 22.04 Arm64 @@ -2211,7 +2173,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit combine-all-code-coverage: name: Combine Code Coverage @@ -2288,14 +2249,7 @@ jobs: run: | python3 -m pip install 'nox==2022.8.7' - - name: Install Codecov CLI - run: | - python3 -m pip install codecov-cli - - name: Tell Codecov To Process Reports - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - send-notifications --git-service github --sha ${{ github.sha }} - name: Get coverage reports id: get-coverage-reports diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 3153fa677f1..7d4eb15b89c 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -273,22 +273,7 @@ jobs: name: testrun-changed-files.txt path: testrun-changed-files.txt - - name: Install Codecov CLI - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - python3 -m pip install codecov-cli - - name: Save Commit Metadata In Codecov - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - create-commit --git-service github --sha ${{ github.sha }} - - - name: Create Codecov Coverage Report - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - create-report --git-service github --sha ${{ github.sha }} pre-commit: name: Pre-Commit if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} @@ -1701,7 +1686,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit windows-2019: name: Windows 2019 @@ -1722,7 +1706,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit windows-2022: name: Windows 2022 @@ -1743,7 +1726,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit macos-12: name: macOS 12 @@ -1764,7 +1746,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit almalinux-8: name: Alma Linux 8 @@ -1785,7 +1766,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit almalinux-9: name: Alma Linux 9 @@ -1806,7 +1786,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit amazonlinux-2: name: Amazon Linux 2 @@ -1827,7 +1806,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit archlinux-lts: name: Arch Linux LTS @@ -1848,7 +1826,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit centos-7: name: CentOS 7 @@ -1869,7 +1846,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit centosstream-8: name: CentOS Stream 8 @@ -1890,7 +1866,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit centosstream-9: name: CentOS Stream 9 @@ -1911,7 +1886,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit debian-10: name: Debian 10 @@ -1932,7 +1906,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit debian-11: name: Debian 11 @@ -1953,7 +1926,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit debian-11-arm64: name: Debian 11 Arm64 @@ -1974,7 +1946,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit fedora-37: name: Fedora 37 @@ -1995,7 +1966,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit fedora-38: name: Fedora 38 @@ -2016,7 +1986,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit opensuse-15: name: Opensuse 15 @@ -2037,7 +2006,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit photonos-3: name: Photon OS 3 @@ -2058,7 +2026,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit photonos-4: name: Photon OS 4 @@ -2079,7 +2046,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit photonos-4-arm64: name: Photon OS 4 Arm64 @@ -2100,7 +2066,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit ubuntu-2004: name: Ubuntu 20.04 @@ -2121,7 +2086,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit ubuntu-2004-arm64: name: Ubuntu 20.04 Arm64 @@ -2142,7 +2106,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit ubuntu-2204: name: Ubuntu 22.04 @@ -2163,7 +2126,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit ubuntu-2204-arm64: name: Ubuntu 22.04 Arm64 @@ -2184,7 +2146,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: false skip-junit-reports: false - secrets: inherit combine-all-code-coverage: name: Combine Code Coverage @@ -2261,14 +2222,7 @@ jobs: run: | python3 -m pip install 'nox==2022.8.7' - - name: Install Codecov CLI - run: | - python3 -m pip install codecov-cli - - name: Tell Codecov To Process Reports - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - send-notifications --git-service github --sha ${{ github.sha }} - name: Get coverage reports id: get-coverage-reports diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 0d39ffb3d8a..812a0e138ac 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -278,22 +278,7 @@ jobs: name: testrun-changed-files.txt path: testrun-changed-files.txt - - name: Install Codecov CLI - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - python3 -m pip install codecov-cli - - name: Save Commit Metadata In Codecov - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - create-commit --git-service github --sha ${{ github.sha }} - - - name: Create Codecov Coverage Report - if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} - run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - create-report --git-service github --sha ${{ github.sha }} pre-commit: name: Pre-Commit if: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} @@ -1723,7 +1708,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit windows-2019: name: Windows 2019 @@ -1744,7 +1728,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit windows-2022: name: Windows 2022 @@ -1765,7 +1748,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit macos-12: name: macOS 12 @@ -1786,7 +1768,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit almalinux-8: name: Alma Linux 8 @@ -1807,7 +1788,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit almalinux-9: name: Alma Linux 9 @@ -1828,7 +1808,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit amazonlinux-2: name: Amazon Linux 2 @@ -1849,7 +1828,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit archlinux-lts: name: Arch Linux LTS @@ -1870,7 +1848,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit centos-7: name: CentOS 7 @@ -1891,7 +1868,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit centosstream-8: name: CentOS Stream 8 @@ -1912,7 +1888,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit centosstream-9: name: CentOS Stream 9 @@ -1933,7 +1908,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit debian-10: name: Debian 10 @@ -1954,7 +1928,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit debian-11: name: Debian 11 @@ -1975,7 +1948,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit debian-11-arm64: name: Debian 11 Arm64 @@ -1996,7 +1968,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit fedora-37: name: Fedora 37 @@ -2017,7 +1988,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit fedora-38: name: Fedora 38 @@ -2038,7 +2008,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit opensuse-15: name: Opensuse 15 @@ -2059,7 +2028,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit photonos-3: name: Photon OS 3 @@ -2080,7 +2048,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit photonos-4: name: Photon OS 4 @@ -2101,7 +2068,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit photonos-4-arm64: name: Photon OS 4 Arm64 @@ -2122,7 +2088,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit ubuntu-2004: name: Ubuntu 20.04 @@ -2143,7 +2108,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit ubuntu-2004-arm64: name: Ubuntu 20.04 Arm64 @@ -2164,7 +2128,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit ubuntu-2204: name: Ubuntu 22.04 @@ -2185,7 +2148,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit ubuntu-2204-arm64: name: Ubuntu 22.04 Arm64 @@ -2206,7 +2168,6 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 skip-code-coverage: true skip-junit-reports: true - secrets: inherit build-src-repo: name: Build Source Repository diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index c8f9892385a..1fdb3d1ddf8 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -347,6 +347,8 @@ run: | python3 -m pip install 'nox==<{ nox_version }>' +{# We can't yet use tokenless uploads with the codecov CLI + - name: Install Codecov CLI run: | python3 -m pip install codecov-cli @@ -356,6 +358,8 @@ codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ send-notifications --git-service github --sha ${{ github.sha }} +#} + - name: Get coverage reports id: get-coverage-reports uses: actions/download-artifact@v3 diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja index 80c056b8fa7..bf98f9c2277 100644 --- a/.github/workflows/templates/layout.yml.jinja +++ b/.github/workflows/templates/layout.yml.jinja @@ -303,6 +303,8 @@ jobs: name: testrun-changed-files.txt path: testrun-changed-files.txt +{# We can't yet use tokenless uploads with the codecov CLI + - name: Install Codecov CLI if: ${{ fromJSON(steps.define-testrun.outputs.testrun)['skip_code_coverage'] == false }} run: | @@ -320,6 +322,8 @@ jobs: codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ create-report --git-service github --sha ${{ github.sha }} +#} + <%- endblock prepare_workflow_job %> <%- endif %> diff --git a/.github/workflows/templates/test-salt.yml.jinja b/.github/workflows/templates/test-salt.yml.jinja index 4ea79858ac2..688d9df5263 100644 --- a/.github/workflows/templates/test-salt.yml.jinja +++ b/.github/workflows/templates/test-salt.yml.jinja @@ -23,7 +23,6 @@ cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> skip-code-coverage: <{ skip_test_coverage_check }> skip-junit-reports: <{ skip_junit_reports_check }> - secrets: inherit <%- endfor %> @@ -49,7 +48,6 @@ cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> skip-code-coverage: <{ skip_test_coverage_check }> skip-junit-reports: <{ skip_junit_reports_check }> - secrets: inherit <%- endfor %> @@ -94,6 +92,5 @@ cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> skip-code-coverage: <{ skip_test_coverage_check }> skip-junit-reports: <{ skip_junit_reports_check }> - secrets: inherit <%- endfor %> diff --git a/.github/workflows/test-action-macos.yml b/.github/workflows/test-action-macos.yml index 5720c661f7a..a5993444dcf 100644 --- a/.github/workflows/test-action-macos.yml +++ b/.github/workflows/test-action-macos.yml @@ -322,24 +322,41 @@ jobs: - name: Install Codecov CLI if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' run: | - python3 -m pip install codecov-cli + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/macos/codecov + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov - name: Upload Source Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/salt.xml \ - --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} + ./codecov --file artifacts/coverage/salt.xml \ + --flags salt,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/tests.xml \ - --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} + ./codecov --file artifacts/coverage/tests.xml \ + --flags tests,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - name: Prepare Test Run Artifacts diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 5cb4a75531c..59b340022a2 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -278,24 +278,41 @@ jobs: - name: Install Codecov CLI if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - python3 -m pip install codecov-cli + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov - name: Upload Source Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/salt.xml \ - --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} + ./codecov --file artifacts/coverage/salt.xml \ + --flags salt,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/tests.xml \ - --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ inputs.distro-slug }} --flag ${{ matrix.tests-chunk }} \ + # --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} + ./codecov --file artifacts/coverage/tests.xml \ + --flags tests,${{ inputs.distro-slug }},${{ matrix.tests-chunk }} \ --name ${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }} - name: Upload Code Coverage Test Run Artifacts diff --git a/.github/workflows/test-package-downloads-action-linux.yml b/.github/workflows/test-package-downloads-action-linux.yml index 5c8f246539e..651c4eb36bd 100644 --- a/.github/workflows/test-package-downloads-action-linux.yml +++ b/.github/workflows/test-package-downloads-action-linux.yml @@ -200,24 +200,41 @@ jobs: - name: Install Codecov CLI if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - python3 -m pip install codecov-cli + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov - name: Upload Source Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/salt.xml \ - --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + ./codecov --file artifacts/coverage/salt.xml \ + --flags salt,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/tests.xml \ - --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + ./codecov --file artifacts/coverage/tests.xml \ + --flags tests,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - name: Upload Test Run Artifacts diff --git a/.github/workflows/test-package-downloads-action-macos.yml b/.github/workflows/test-package-downloads-action-macos.yml index 0e8cd225f7d..54683f4a35f 100644 --- a/.github/workflows/test-package-downloads-action-macos.yml +++ b/.github/workflows/test-package-downloads-action-macos.yml @@ -183,24 +183,41 @@ jobs: - name: Install Codecov CLI if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' run: | - python3 -m pip install codecov-cli + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/macos/codecov + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov - name: Upload Source Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/salt.xml \ - --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + ./codecov --file artifacts/coverage/salt.xml \ + --flags salt,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/tests.xml \ - --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + ./codecov --file artifacts/coverage/tests.xml \ + --flags tests,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - name: Upload Test Run Artifacts diff --git a/.github/workflows/test-package-downloads-action-windows.yml b/.github/workflows/test-package-downloads-action-windows.yml index 4447ef505e6..41763ec44af 100644 --- a/.github/workflows/test-package-downloads-action-windows.yml +++ b/.github/workflows/test-package-downloads-action-windows.yml @@ -199,24 +199,41 @@ jobs: - name: Install Codecov CLI if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - python3 -m pip install codecov-cli + # We can't yet use tokenless uploads with the codecov CLI + # python3 -m pip install codecov-cli + # + curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM + shasum -a 256 -c codecov.SHA256SUM + chmod +x codecov - name: Upload Source Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/salt.xml \ - --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/salt.xml \ + # --flag salt --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + ./codecov --file artifacts/coverage/salt.xml \ + --flags salt,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - name: Upload Tests Code Coverage To Codecov if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' run: | - codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - do-upload --git-service github --sha ${{ github.sha }} \ - --file artifacts/coverage/tests.xml \ - --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + # We can't yet use tokenless uploads with the codecov CLI + #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ + # do-upload --git-service github --sha ${{ github.sha }} \ + # --file artifacts/coverage/tests.xml \ + # --flag tests --flag ${{ inputs.distro-slug }} --flag pkg \ + # --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs + ./codecov --file artifacts/coverage/tests.xml \ + --flags tests,${{ inputs.distro-slug }},pkg \ --name ${{ inputs.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - name: Upload Test Run Artifacts