From adfacf2d276b158264c48ff298490fbdf13e4fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Kautler?= Date: Wed, 1 Jan 2025 19:22:00 +0100 Subject: [PATCH 1/9] fix: remove erroneous linebreak in readme (#1734) --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 318980dd1d..c185d80e10 100644 --- a/README.md +++ b/README.md @@ -106,8 +106,7 @@ Codecov's Action supports inputs from the user. These inputs, along with their d | Input | Description | Required | | :--- | :--- | :---: | | `binary` | The file location of a pre-downloaded version of the CLI. If specified, integrity checking will be bypassed. | Optional -| `codecov_yml_path` | The location of the codecov.yml file. This is crrently ONLY used for automated test selection (https://docs.codecov.com/docs/getting-started-with-ats). Note that for all other cases, the Codecov yaml will need to be locate -d as described here: https://docs.codecov.com/docs/codecov-yaml#can-i-name-the-file-codecovyml | Optional +| `codecov_yml_path` | The location of the codecov.yml file. This is crrently ONLY used for automated test selection (https://docs.codecov.com/docs/getting-started-with-ats). Note that for all other cases, the Codecov yaml will need to be located as described here: https://docs.codecov.com/docs/codecov-yaml#can-i-name-the-file-codecovyml | Optional | `commit_parent` | SHA (with 40 chars) of what should be the parent of this commit. | Optional | `directory` | Folder to search for coverage files. Default to the current working directory | Optional | `disable_file_fixes` | Disable file fixes to ignore common lines from coverage (e.g. blank lines or empty brackets). Read more here https://docs.codecov.com/docs/fixing-reports | Optional From 54a0566d1caf986dcc042eb71da69c0e69d26987 Mon Sep 17 00:00:00 2001 From: Tom Hu <88201630+thomasrockhu-codecov@users.noreply.github.com> Date: Wed, 15 Jan 2025 14:32:42 -0300 Subject: [PATCH 2/9] feat: add disable-telem feature (#1739) --- action.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/action.yml b/action.yml index 04dca4f72d..0a40b59360 100644 --- a/action.yml +++ b/action.yml @@ -28,6 +28,10 @@ inputs: description: 'Disable setting safe directory. Set to true to disable.' required: false default: 'false' + disable_telem: + description: 'Disable sending telemetry data to Codecov. Set to true to disable.' + required: false + default: 'false' dry_run: description: "Don't upload files to Codecov" required: false @@ -254,6 +258,7 @@ runs: CC_DIR: ${{ inputs.directory }} CC_DISABLE_FILE_FIXES: ${{ inputs.disable_file_fixes }} CC_DISABLE_SEARCH: ${{ inputs.disable_search }} + CC_DISABLE_TELEM: ${{ inputs.disable_telem }} CC_DRY_RUN: ${{ inputs.dry_run }} CC_ENTERPRISE_URL: ${{ inputs.url }} CC_ENV: ${{ inputs.env_vars }} From 25fe46e17d692bac1908f2f457f98d2c936d894d Mon Sep 17 00:00:00 2001 From: Tom Hu <88201630+thomasrockhu-codecov@users.noreply.github.com> Date: Fri, 17 Jan 2025 18:15:05 -0300 Subject: [PATCH 3/9] chore(deps): bump wrapper to 0.0.32 (#1740) --- dist/codecov.sh | 12 +++++++++++- src/scripts | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dist/codecov.sh b/dist/codecov.sh index 137f6a30aa..224d6cee53 100755 --- a/dist/codecov.sh +++ b/dist/codecov.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -CC_WRAPPER_VERSION="0.0.31" +CC_WRAPPER_VERSION="0.0.32" set +u say() { echo -e "$1" @@ -117,6 +117,15 @@ CC_PUBLIC_PGP_KEY=$(curl -s https://keybase.io/codecovsecurity/pgp_keys.asc) say "$g==>$x CLI integrity verified" say fi +if [ -n "$CC_BINARY_LOCATION" ]; +then + mkdir -p "$CC_BINARY_LOCATION" && mv "$cc_filename" $_ + say "$g==>$x Codecov binary moved to ${CC_BINARY_LOCATION}" +fi +if [ "$CC_DOWNLOAD_ONLY" = "true" ]; +then + say "$g==>$x Codecov download only called. Exiting..." +fi cc_cli_args=() cc_cli_args+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM)) cc_cli_args+=( $(k_arg ENTERPRISE_URL) $(v_arg ENTERPRISE_URL)) @@ -125,6 +134,7 @@ then cc_cli_args+=( "--codecov-yml-path" ) cc_cli_args+=( "$CC_YML_PATH" ) fi +cc_cli_args+=( $(write_truthy_args CC_DISABLE_TELEM) ) cc_cli_args+=( $(write_truthy_args CC_VERBOSE) ) cc_uc_args=() # Args for create commit diff --git a/src/scripts b/src/scripts index 8e89f7cbab..b7950068a5 160000 --- a/src/scripts +++ b/src/scripts @@ -1 +1 @@ -Subproject commit 8e89f7cbab22e735f8d19adc185b9fe98ac07c2f +Subproject commit b7950068a521c1d34fe35cf2157b3755918338b5 From 79ee03789caf775088b189734174ec173bc60c02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 09:21:27 -0300 Subject: [PATCH 4/9] build(deps): bump actions/upload-artifact from 4.4.3 to 4.6.0 (#1743) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.3 to 4.6.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882...65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 9cde490ab9..72da74a21c 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -49,7 +49,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: SARIF file path: results.sarif From ad45165bd4a83d2b1f3765391b25169a62face76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 09:21:43 -0300 Subject: [PATCH 5/9] build(deps): bump github/codeql-action from 3.27.9 to 3.28.1 (#1742) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.9 to 3.28.1. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v3.27.9...v3.28.1) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 00e91d3879..38ea5d3000 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -41,7 +41,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v3.27.9 + uses: github/codeql-action/init@v3.28.1 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -52,7 +52,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v3.27.9 + uses: github/codeql-action/autobuild@v3.28.1 # â„šī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -66,4 +66,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3.27.9 + uses: github/codeql-action/analyze@v3.28.1 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 72da74a21c..ac24936d89 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -57,6 +57,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@v3.27.9 # v1.0.26 + uses: github/codeql-action/upload-sarif@v3.28.1 # v1.0.26 with: sarif_file: results.sarif From 6c5b693a58b15cefda3a7403bf51de71c223ef00 Mon Sep 17 00:00:00 2001 From: Juho Majasaari Date: Tue, 21 Jan 2025 17:24:48 +0200 Subject: [PATCH 6/9] use correct audience when requesting oidc token (#1744) * use correct audience when requesting oidc token * Update action.yml * Update action.yml --------- Co-authored-by: Tom Hu <88201630+thomasrockhu-codecov@users.noreply.github.com> --- action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 0a40b59360..736e5c421c 100644 --- a/action.yml +++ b/action.yml @@ -192,7 +192,7 @@ runs: then # {"count":1984,"value":"***"} echo -e "\033[0;32m==>\033[0m Requesting OIDC token from '$ACTIONS_ID_TOKEN_REQUEST_URL'" - CC_TOKEN=$(curl -H "Authorization: bearer $ACTIONS_ID_TOKEN_REQUEST_TOKEN" "$ACTIONS_ID_TOKEN_REQUEST_URL&audience=https://codecov.io" | cut -d\" -f6) + CC_TOKEN=$(curl -H "Authorization: bearer $ACTIONS_ID_TOKEN_REQUEST_TOKEN" "$ACTIONS_ID_TOKEN_REQUEST_URL&audience=$CC_OIDC_AUDIENCE" | cut -d\" -f6) echo "CC_TOKEN=$CC_TOKEN" >> "$GITHUB_ENV" elif [ -n "${{ env.CODECOV_TOKEN }}" ]; then @@ -206,6 +206,8 @@ runs: echo "CC_TOKEN=$CC_TOKEN" >> "$GITHUB_ENV" fi fi + env: + CC_OIDC_AUDIENCE: ${{ inputs.url || 'https://codecov.io' }} - name: Override branch for forks shell: bash From b1a63834ce744b09ffd721206f6874b967bd8a07 Mon Sep 17 00:00:00 2001 From: Tom Hu <88201630+thomasrockhu-codecov@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:08:22 -0300 Subject: [PATCH 7/9] Th/add commands (#1745) * chore(deps): bump wrapper to 0.0.33 * feat: allow for new commands * fix: bump to 0.0.34 --- CHANGELOG.md | 2 +- action.yml | 14 +++++ dist/codecov.sh | 135 ++++++++++++++++++++++++++++-------------------- src/scripts | 2 +- 4 files changed, 96 insertions(+), 57 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be64204dfd..61ff836fc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1009,4 +1009,4 @@ for the full list. ### Dependencies and Misc - #166 Bump requestretry from 4.1.1 to 4.1.2 - #169 Bump typescript from 4.0.5 to 4.1.2 -- #178 Bump @types/jest from 26.0.15 to 26.0.19 \ No newline at end of file +- #178 Bump @types/jest from 26.0.15 to 26.0.19 diff --git a/action.yml b/action.yml index 736e5c421c..4639bb4592 100644 --- a/action.yml +++ b/action.yml @@ -4,6 +4,9 @@ name: 'Codecov' description: 'GitHub Action that uploads coverage reports for your repository to codecov.io' author: 'Thomas Hu <@thomasrockhu-codecov> | Codecov' inputs: + base_sha: + description: 'The base SHA to select. This is only used in the "pr-base-picking" run command' + required: false binary: description: 'The file location of a pre-downloaded version of the CLI. If specified, integrity checking will be bypassed.' required: false @@ -52,6 +55,9 @@ inputs: flags: description: 'Comma-separated list of flags to upload to group coverage metrics.' required: false + force: + description: 'Only used for empty-upload run command' + required: false git_service: description: 'Override the git_service (e.g. github_enterprise)' required: false @@ -115,6 +121,10 @@ inputs: root_dir: description: 'Root folder from which to consider paths on the network section. Defaults to current working directory.' required: false + run_command: + description: 'Choose which CLI command to run. Options are "upload-coverage", "empty-upload", "pr-base-picking", "send-notifications". "upload-coverage" is run by default.' + required: false + default: 'upload-coverage' skip_validation: description: 'Skip integrity checking of the CLI. This is NOT recommended.' required: false @@ -253,6 +263,7 @@ runs: shell: bash working-directory: ${{ inputs.working-directory }} env: + CC_BASE_SHA: ${{ inputs.base_sha }} CC_BINARY: ${{ inputs.binary }} CC_BUILD: ${{ inputs.override_build }} CC_BUILD_URL: ${{ inputs.override_build_url }} @@ -268,6 +279,7 @@ runs: CC_FAIL_ON_ERROR: ${{ inputs.fail_ci_if_error }} CC_FILES: ${{ inputs.files }} CC_FLAGS: ${{ inputs.flags }} + CC_FORCE: ${{ inputs.force }} CC_GCOV_ARGS: ${{ inputs.gcov_args }} CC_GCOV_EXECUTABLE: ${{ inputs.gcov_executable }} CC_GCOV_IGNORE: ${{ inputs.gcov_ignore }} @@ -284,6 +296,8 @@ runs: CC_PARENT_SHA: ${{ inputs.commit_parent }} CC_PLUGINS: ${{ inputs.plugins }} CC_REPORT_TYPE: ${{ inputs.report_type }} + CC_RUN_COMMAND: ${{ inputs.run_command }} + CC_SERVICE: ${{ inputs.git_service }} CC_SKIP_VALIDATION: ${{ inputs.skip_validation }} CC_SLUG: ${{ inputs.slug }} CC_SWIFT_PROJECT: ${{ inputs.swift_project }} diff --git a/dist/codecov.sh b/dist/codecov.sh index 224d6cee53..065c30d4b8 100755 --- a/dist/codecov.sh +++ b/dist/codecov.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -CC_WRAPPER_VERSION="0.0.32" +CC_WRAPPER_VERSION="0.0.34" set +u say() { echo -e "$1" @@ -47,6 +47,7 @@ say " _____ _ " CC_VERSION="${CC_VERSION:-latest}" CC_FAIL_ON_ERROR="${CC_FAIL_ON_ERROR:-false}" +CC_RUN_COMMAND="${CC_RUN_COMMAND:-upload-coverage}" if [ -n "$CC_BINARY" ]; then if [ -f "$CC_BINARY" ]; @@ -84,7 +85,7 @@ else curl -Os "$cc_url" say "$g==>$x Finishing downloading $b${CC_OS}:${CC_VERSION}$x" version_url="https://cli.codecov.io/api/${CC_OS}/${CC_VERSION}" - version=$(curl -s "$version_url" -H "Accept:application/json" | jq -r '.version') + version=$(curl -s "$version_url" -H "Accept:application/json" | tr \{ '\n' | tr , '\n' | tr \} '\n' | grep "\"version\"" | awk -F'"' '{print $4}' | tail -1) say " Version: $b$version$x" say " " fi @@ -136,91 +137,115 @@ then fi cc_cli_args+=( $(write_truthy_args CC_DISABLE_TELEM) ) cc_cli_args+=( $(write_truthy_args CC_VERBOSE) ) -cc_uc_args=() +if [ -n "$CC_TOKEN_VAR" ]; +then + token="$(eval echo \$$CC_TOKEN_VAR)" +else + token="$(eval echo $CC_TOKEN)" +fi +say "$g ->$x Token of length ${#token} detected" +token_str="" +token_arg=() +if [ -n "$token" ]; +then + token_str+=" -t " + token_arg+=( " -t " "$token") +fi +if [ "$CC_RUN_COMMAND" == "upload-coverage" ]; then +cc_run_args=() # Args for create commit -cc_uc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) ) -cc_uc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) -cc_uc_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA)) -cc_uc_args+=( $(k_arg PR) $(v_arg PR)) -cc_uc_args+=( $(k_arg SHA) $(v_arg SHA)) -cc_uc_args+=( $(k_arg SLUG) $(v_arg SLUG)) +cc_run_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) ) +cc_run_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) +cc_run_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA)) +cc_run_args+=( $(k_arg PR) $(v_arg PR)) +cc_run_args+=( $(k_arg SHA) $(v_arg SHA)) +cc_run_args+=( $(k_arg SLUG) $(v_arg SLUG)) # Args for create report -cc_uc_args+=( $(k_arg CODE) $(v_arg CODE)) +cc_run_args+=( $(k_arg CODE) $(v_arg CODE)) # Args for do upload -cc_uc_args+=( $(k_arg ENV) $(v_arg ENV)) +cc_run_args+=( $(k_arg ENV) $(v_arg ENV)) OLDIFS=$IFS;IFS=, -cc_uc_args+=( $(k_arg BRANCH) $(v_arg BRANCH)) -cc_uc_args+=( $(k_arg BUILD) $(v_arg BUILD)) -cc_uc_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL)) -cc_uc_args+=( $(k_arg DIR) $(v_arg DIR)) -cc_uc_args+=( $(write_truthy_args CC_DISABLE_FILE_FIXES) ) -cc_uc_args+=( $(write_truthy_args CC_DISABLE_SEARCH) ) -cc_uc_args+=( $(write_truthy_args CC_DRY_RUN) ) +cc_run_args+=( $(k_arg BRANCH) $(v_arg BRANCH)) +cc_run_args+=( $(k_arg BUILD) $(v_arg BUILD)) +cc_run_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL)) +cc_run_args+=( $(k_arg DIR) $(v_arg DIR)) +cc_run_args+=( $(write_truthy_args CC_DISABLE_FILE_FIXES) ) +cc_run_args+=( $(write_truthy_args CC_DISABLE_SEARCH) ) +cc_run_args+=( $(write_truthy_args CC_DRY_RUN) ) if [ -n "$CC_EXCLUDES" ]; then for directory in $CC_EXCLUDES; do - cc_uc_args+=( "--exclude" "$directory" ) + cc_run_args+=( "--exclude" "$directory" ) done fi if [ -n "$CC_FILES" ]; then for file in $CC_FILES; do - cc_uc_args+=( "--file" "$file" ) + cc_run_args+=( "--file" "$file" ) done fi if [ -n "$CC_FLAGS" ]; then for flag in $CC_FLAGS; do - cc_uc_args+=( "--flag" "$flag" ) + cc_run_args+=( "--flag" "$flag" ) done fi -cc_uc_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS)) -cc_uc_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE)) -cc_uc_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE)) -cc_uc_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE)) -cc_uc_args+=( $(write_truthy_args CC_HANDLE_NO_REPORTS_FOUND) ) -cc_uc_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE)) -cc_uc_args+=( $(write_truthy_args CC_LEGACY) ) +cc_run_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS)) +cc_run_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE)) +cc_run_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE)) +cc_run_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE)) +cc_run_args+=( $(write_truthy_args CC_HANDLE_NO_REPORTS_FOUND) ) +cc_run_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE)) +cc_run_args+=( $(write_truthy_args CC_LEGACY) ) if [ -n "$CC_NAME" ]; then - cc_uc_args+=( "--name" "$CC_NAME" ) + cc_run_args+=( "--name" "$CC_NAME" ) fi -cc_uc_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER)) -cc_uc_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX)) -cc_uc_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER)) +cc_run_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER)) +cc_run_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX)) +cc_run_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER)) if [ -n "$CC_PLUGINS" ]; then for plugin in $CC_PLUGINS; do - cc_uc_args+=( "--plugin" "$plugin" ) + cc_run_args+=( "--plugin" "$plugin" ) done fi -cc_uc_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE)) -cc_uc_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT)) +cc_run_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE)) +cc_run_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT)) IFS=$OLDIFS -unset NODE_OPTIONS -# See https://github.com/codecov/uploader/issues/475 -chmod +x $cc_command -if [ -n "$CC_TOKEN_VAR" ]; -then - token="$(eval echo \$$CC_TOKEN_VAR)" +elif [ "$CC_RUN_COMMAND" == "empty-upload" ]; then +cc_run_args=() +cc_run_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) ) +cc_run_args+=( $(write_truthy_args CC_FORCE) ) +cc_run_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) +cc_run_args+=( $(k_arg SHA) $(v_arg SHA)) +cc_run_args+=( $(k_arg SLUG) $(v_arg SLUG)) +elif [ "$CC_RUN_COMMAND" == "pr-base-picking" ]; then +cc_run_args=() +cc_run_args+=( $(k_arg BASE_SHA) $(v_arg BASE_SHA)) +cc_run_args+=( $(k_arg PR) $(v_arg PR)) +cc_run_args+=( $(k_arg SLUG) $(v_arg SLUG)) +cc_run_args+=( $(k_arg SERVICE) $(v_arg SERVICE)) +elif [ "$CC_RUN_COMMAND" == "send-notifications" ]; then +cc_run_args=() +cc_run_args+=( $(k_arg SHA) $(v_arg SHA)) +cc_run_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) ) +cc_run_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) +cc_run_args+=( $(k_arg SLUG) $(v_arg SLUG)) else - token="$(eval echo $CC_TOKEN)" + exit_if_error "Invalid run command specified: $CC_RUN_COMMAND" + exit fi -say "$g ->$x Token of length ${#token} detected" -token_str="" -token_arg=() -if [ -n "$token" ]; -then - token_str+=" -t " - token_arg+=( " -t " "$token") -fi -say "$g==>$x Running upload-coverage" -say " $b$cc_command $(echo "${cc_cli_args[@]}") upload-coverage$token_str $(echo "${cc_uc_args[@]}")$x" +unset NODE_OPTIONS +# See https://github.com/codecov/uploader/issues/475 +chmod +x "$cc_command" +say "$g==>$x Running $CC_RUN_COMMAND" +say " $b$cc_command $(echo "${cc_cli_args[@]}")$CC_RUN_COMMAND$token_str $(echo "${cc_run_args[@]}")$x" if ! $cc_command \ ${cc_cli_args[*]} \ - upload-coverage \ + ${CC_RUN_COMMAND} \ ${token_arg[*]} \ - "${cc_uc_args[@]}"; + "${cc_run_args[@]}"; then - exit_if_error "Failed to upload coverage" + exit_if_error "Failed to run $CC_RUN_COMMAND" fi diff --git a/src/scripts b/src/scripts index b7950068a5..fc1e2e73ce 160000 --- a/src/scripts +++ b/src/scripts @@ -1 +1 @@ -Subproject commit b7950068a521c1d34fe35cf2157b3755918338b5 +Subproject commit fc1e2e73ced08ad84f9e9b67f853e3b67108eddf From 5825942583afb2414b3c7097ffae795c7cb4c042 Mon Sep 17 00:00:00 2001 From: tserg <8017125+tserg@users.noreply.github.com> Date: Thu, 23 Jan 2025 00:08:39 +0800 Subject: [PATCH 8/9] Fix typo in README (#1747) Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c185d80e10..0d8a954219 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ Codecov's Action supports inputs from the user. These inputs, along with their d | Input | Description | Required | | :--- | :--- | :---: | | `binary` | The file location of a pre-downloaded version of the CLI. If specified, integrity checking will be bypassed. | Optional -| `codecov_yml_path` | The location of the codecov.yml file. This is crrently ONLY used for automated test selection (https://docs.codecov.com/docs/getting-started-with-ats). Note that for all other cases, the Codecov yaml will need to be located as described here: https://docs.codecov.com/docs/codecov-yaml#can-i-name-the-file-codecovyml | Optional +| `codecov_yml_path` | The location of the codecov.yml file. This is currently ONLY used for automated test selection (https://docs.codecov.com/docs/getting-started-with-ats). Note that for all other cases, the Codecov yaml will need to be located as described here: https://docs.codecov.com/docs/codecov-yaml#can-i-name-the-file-codecovyml | Optional | `commit_parent` | SHA (with 40 chars) of what should be the parent of this commit. | Optional | `directory` | Folder to search for coverage files. Default to the current working directory | Optional | `disable_file_fixes` | Disable file fixes to ignore common lines from coverage (e.g. blank lines or empty brackets). Read more here https://docs.codecov.com/docs/fixing-reports | Optional From 5a605bd92782ce0810fa3b8acc235c921b497052 Mon Sep 17 00:00:00 2001 From: Tom Hu <88201630+thomasrockhu-codecov@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:33:10 -0300 Subject: [PATCH 9/9] chore(release): bump to 5.2.0 (#1748) --- CHANGELOG.md | 18 +++++++++++++++++- src/version | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61ff836fc1..422f57f8b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +## v5.2.0 + +### What's Changed +* Fix typo in README by @tserg in https://github.com/codecov/codecov-action/pull/1747 +* Th/add commands by @thomasrockhu-codecov in https://github.com/codecov/codecov-action/pull/1745 +* use correct audience when requesting oidc token by @juho9000 in https://github.com/codecov/codecov-action/pull/1744 +* build(deps): bump github/codeql-action from 3.27.9 to 3.28.1 by @app/dependabot in https://github.com/codecov/codecov-action/pull/1742 +* build(deps): bump actions/upload-artifact from 4.4.3 to 4.6.0 by @app/dependabot in https://github.com/codecov/codecov-action/pull/1743 +* chore(deps): bump wrapper to 0.0.32 by @thomasrockhu-codecov in https://github.com/codecov/codecov-action/pull/1740 +* feat: add disable-telem feature by @thomasrockhu-codecov in https://github.com/codecov/codecov-action/pull/1739 +* fix: remove erroneous linebreak in readme by @Vampire in https://github.com/codecov/codecov-action/pull/1734 + + +**Full Changelog**: https://github.com/codecov/codecov-action/compare/v5.1.2..v5.2.0 + + ## v5.1.2 ### What's Changed @@ -1009,4 +1025,4 @@ for the full list. ### Dependencies and Misc - #166 Bump requestretry from 4.1.1 to 4.1.2 - #169 Bump typescript from 4.0.5 to 4.1.2 -- #178 Bump @types/jest from 26.0.15 to 26.0.19 +- #178 Bump @types/jest from 26.0.15 to 26.0.19 \ No newline at end of file diff --git a/src/version b/src/version index 61fcc87350..91ff57278e 100644 --- a/src/version +++ b/src/version @@ -1 +1 @@ -5.1.2 +5.2.0