From ab9778893d5b9a240258faf017c62b2cfc00d089 Mon Sep 17 00:00:00 2001 From: Michelle Tran Date: Mon, 10 Mar 2025 10:16:57 -0400 Subject: [PATCH 1/3] Add create commit args to empty-upload --- scripts/set_empty_upload_args.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/set_empty_upload_args.sh b/scripts/set_empty_upload_args.sh index 865d10c..f4b0d21 100755 --- a/scripts/set_empty_upload_args.sh +++ b/scripts/set_empty_upload_args.sh @@ -2,8 +2,11 @@ codecov_args=() +codecov_args+=( $(k_arg BRANCH) $(v_arg BRANCH)) codecov_args+=( $(write_bool_args CODECOV_FAIL_ON_ERROR) ) codecov_args+=( $(write_bool_args CODECOV_FORCE) ) codecov_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) +codecov_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA)) +codecov_args+=( $(k_arg PR) $(v_arg PR)) codecov_args+=( $(k_arg SHA) $(v_arg SHA)) -codecov_args+=( $(k_arg SLUG) $(v_arg SLUG)) +codecov_args+=( $(k_arg SLUG) $(v_arg SLUG)) \ No newline at end of file From 053e3262745a0f4009dcf4d5439239baed4c8829 Mon Sep 17 00:00:00 2001 From: Michelle Tran Date: Mon, 10 Mar 2025 12:15:32 -0400 Subject: [PATCH 2/3] Reduce the number of characters in compiled codecov.sh --- dist/codecov.sh | 159 ++++++++++++++++--------------- package.py | 4 +- scripts/set_empty_upload_args.sh | 2 +- 3 files changed, 84 insertions(+), 81 deletions(-) diff --git a/dist/codecov.sh b/dist/codecov.sh index f2bc8e4..a671476 100755 --- a/dist/codecov.sh +++ b/dist/codecov.sh @@ -52,8 +52,8 @@ if [ -n "$CC_BINARY" ]; then if [ -f "$CC_BINARY" ]; then - cc_filename=$CC_BINARY - cc_command=$CC_BINARY + cfilename=$CC_BINARY + ccommand=$CC_BINARY else exit_if_error "Could not find binary file $CC_BINARY" fi @@ -63,7 +63,7 @@ then exit_if_error "Could not install via pypi." exit fi - cc_command="codecovcli" + ccommand="codecovcli" else if [ -n "$CC_OS" ]; then @@ -79,17 +79,17 @@ else [[ $(arch) == "aarch64" && $family == "linux" ]] && CC_OS+="-arm64" say "$g==>$x Detected $b${CC_OS}$x" fi - cc_filename="codecov" - [[ $CC_OS == "windows" ]] && cc_filename+=".exe" - cc_command="./$cc_filename" + cfilename="codecov" + [[ $CC_OS == "windows" ]] && cfilename+=".exe" + ccommand="./$cfilename" [[ $CC_OS == "macos" ]] && \ ! command -v gpg 2>&1 >/dev/null && \ HOMEBREW_NO_AUTO_UPDATE=1 brew install gpg - cc_url="https://cli.codecov.io" - cc_url="$cc_url/${CC_VERSION}" - cc_url="$cc_url/${CC_OS}/${cc_filename}" - say "$g ->$x Downloading $b${cc_url}$x" - curl -O --retry 5 --retry-delay 2 "$cc_url" + curl="https://cli.codecov.io" + curl="$curl/${CC_VERSION}" + curl="$curl/${CC_OS}/${cfilename}" + say "$g ->$x Downloading $b${curl}$x" + curl -O --retry 5 --retry-delay 2 "$curl" 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" | tr \{ '\n' | tr , '\n' | tr \} '\n' | grep "\"version\"" | awk -F'"' '{print $4}' | tail -1) @@ -107,44 +107,44 @@ CC_PUBLIC_PGP_KEY=$(curl -s https://keybase.io/codecovsecurity/pgp_keys.asc) say "$g==>$x Verifying GPG signature integrity" sha_url="https://cli.codecov.io" sha_url="${sha_url}/${CC_VERSION}/${CC_OS}" - sha_url="${sha_url}/${cc_filename}.SHA256SUM" + sha_url="${sha_url}/${cfilename}.SHA256SUM" say "$g ->$x Downloading $b${sha_url}$x" say "$g ->$x Downloading $b${sha_url}.sig$x" say " " curl -Os --retry 5 --retry-delay 2 --connect-timeout 2 "$sha_url" curl -Os --retry 5 --retry-delay 2 --connect-timeout 2 "${sha_url}.sig" - if ! gpg --verify "${cc_filename}.SHA256SUM.sig" "${cc_filename}.SHA256SUM"; + if ! gpg --verify "${cfilename}.SHA256SUM.sig" "${cfilename}.SHA256SUM"; then exit_if_error "Could not verify signature. Please contact Codecov if problem continues" fi - if ! (shasum -a 256 -c "${cc_filename}.SHA256SUM" 2>/dev/null || \ - sha256sum -c "${cc_filename}.SHA256SUM"); + if ! (shasum -a 256 -c "${cfilename}.SHA256SUM" 2>/dev/null || \ + sha256sum -c "${cfilename}.SHA256SUM"); then exit_if_error "Could not verify SHASUM. Please contact Codecov if problem continues" fi say "$g==>$x CLI integrity verified" say - chmod +x "$cc_command" + chmod +x "$ccommand" fi if [ -n "$CC_BINARY_LOCATION" ]; then - mkdir -p "$CC_BINARY_LOCATION" && mv "$cc_filename" $_ + mkdir -p "$CC_BINARY_LOCATION" && mv "$cfilename" $_ 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)) +ccli_args=() +ccli_args+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM)) +ccli_args+=( $(k_arg ENTERPRISE_URL) $(v_arg ENTERPRISE_URL)) if [ -n "$CC_YML_PATH" ] then - cc_cli_args+=( "--codecov-yml-path" ) - cc_cli_args+=( "$CC_YML_PATH" ) + ccli_args+=( "--codecov-yml-path" ) + ccli_args+=( "$CC_YML_PATH" ) fi -cc_cli_args+=( $(write_bool_args CC_DISABLE_TELEM) ) -cc_cli_args+=( $(write_bool_args CC_VERBOSE) ) +ccli_args+=( $(write_bool_args CC_DISABLE_TELEM) ) +ccli_args+=( $(write_bool_args CC_VERBOSE) ) if [ -n "$CC_TOKEN_VAR" ]; then token="$(eval echo \$$CC_TOKEN_VAR)" @@ -160,87 +160,90 @@ then token_arg+=( " -t " "$token") fi if [ "$CC_RUN_CMD" == "upload-coverage" ]; then -cc_args=() +cargs=() # Args for create commit -cc_args+=( $(write_bool_args CC_FAIL_ON_ERROR) ) -cc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) -cc_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA)) -cc_args+=( $(k_arg PR) $(v_arg PR)) -cc_args+=( $(k_arg SHA) $(v_arg SHA)) -cc_args+=( $(k_arg SLUG) $(v_arg SLUG)) +cargs+=( $(write_bool_args CC_FAIL_ON_ERROR) ) +cargs+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) +cargs+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA)) +cargs+=( $(k_arg PR) $(v_arg PR)) +cargs+=( $(k_arg SHA) $(v_arg SHA)) +cargs+=( $(k_arg SLUG) $(v_arg SLUG)) # Args for create report -cc_args+=( $(k_arg CODE) $(v_arg CODE)) +cargs+=( $(k_arg CODE) $(v_arg CODE)) # Args for do upload -cc_args+=( $(k_arg ENV) $(v_arg ENV)) +cargs+=( $(k_arg ENV) $(v_arg ENV)) OLDIFS=$IFS;IFS=, -cc_args+=( $(k_arg BRANCH) $(v_arg BRANCH)) -cc_args+=( $(k_arg BUILD) $(v_arg BUILD)) -cc_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL)) -cc_args+=( $(k_arg DIR) $(v_arg DIR)) -cc_args+=( $(write_bool_args CC_DISABLE_FILE_FIXES) ) -cc_args+=( $(write_bool_args CC_DISABLE_SEARCH) ) -cc_args+=( $(write_bool_args CC_DRY_RUN) ) +cargs+=( $(k_arg BRANCH) $(v_arg BRANCH)) +cargs+=( $(k_arg BUILD) $(v_arg BUILD)) +cargs+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL)) +cargs+=( $(k_arg DIR) $(v_arg DIR)) +cargs+=( $(write_bool_args CC_DISABLE_FILE_FIXES) ) +cargs+=( $(write_bool_args CC_DISABLE_SEARCH) ) +cargs+=( $(write_bool_args CC_DRY_RUN) ) if [ -n "$CC_EXCLUDES" ]; then for directory in $CC_EXCLUDES; do - cc_args+=( "--exclude" "$directory" ) + cargs+=( "--exclude" "$directory" ) done fi if [ -n "$CC_FILES" ]; then for file in $CC_FILES; do - cc_args+=( "--file" "$file" ) + cargs+=( "--file" "$file" ) done fi if [ -n "$CC_FLAGS" ]; then for flag in $CC_FLAGS; do - cc_args+=( "--flag" "$flag" ) + cargs+=( "--flag" "$flag" ) done fi -cc_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS)) -cc_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE)) -cc_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE)) -cc_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE)) -cc_args+=( $(write_bool_args CC_HANDLE_NO_REPORTS_FOUND) ) -cc_args+=( $(write_bool_args CC_RECURSE_SUBMODULES) ) -cc_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE)) -cc_args+=( $(write_bool_args CC_LEGACY) ) +cargs+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS)) +cargs+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE)) +cargs+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE)) +cargs+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE)) +cargs+=( $(write_bool_args CC_HANDLE_NO_REPORTS_FOUND) ) +cargs+=( $(write_bool_args CC_RECURSE_SUBMODULES) ) +cargs+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE)) +cargs+=( $(write_bool_args CC_LEGACY) ) if [ -n "$CC_NAME" ]; then - cc_args+=( "--name" "$CC_NAME" ) + cargs+=( "--name" "$CC_NAME" ) fi -cc_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER)) -cc_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX)) -cc_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER)) +cargs+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER)) +cargs+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX)) +cargs+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER)) if [ -n "$CC_PLUGINS" ]; then for plugin in $CC_PLUGINS; do - cc_args+=( "--plugin" "$plugin" ) + cargs+=( "--plugin" "$plugin" ) done fi -cc_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE)) -cc_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT)) +cargs+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE)) +cargs+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT)) IFS=$OLDIFS elif [ "$CC_RUN_CMD" == "empty-upload" ]; then -cc_args=() -cc_args+=( $(write_bool_args CC_FAIL_ON_ERROR) ) -cc_args+=( $(write_bool_args CC_FORCE) ) -cc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) -cc_args+=( $(k_arg SHA) $(v_arg SHA)) -cc_args+=( $(k_arg SLUG) $(v_arg SLUG)) +cargs=() +cargs+=( $(k_arg BRANCH) $(v_arg BRANCH)) +cargs+=( $(write_bool_args CC_FAIL_ON_ERROR) ) +cargs+=( $(write_bool_args CC_FORCE) ) +cargs+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) +cargs+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA)) +cargs+=( $(k_arg PR) $(v_arg PR)) +cargs+=( $(k_arg SHA) $(v_arg SHA)) +cargs+=( $(k_arg SLUG) $(v_arg SLUG)) elif [ "$CC_RUN_CMD" == "pr-base-picking" ]; then -cc_args=() -cc_args+=( $(k_arg BASE_SHA) $(v_arg BASE_SHA)) -cc_args+=( $(k_arg PR) $(v_arg PR)) -cc_args+=( $(k_arg SLUG) $(v_arg SLUG)) -cc_args+=( $(k_arg SERVICE) $(v_arg SERVICE)) +cargs=() +cargs+=( $(k_arg BASE_SHA) $(v_arg BASE_SHA)) +cargs+=( $(k_arg PR) $(v_arg PR)) +cargs+=( $(k_arg SLUG) $(v_arg SLUG)) +cargs+=( $(k_arg SERVICE) $(v_arg SERVICE)) elif [ "$CC_RUN_CMD" == "send-notifications" ]; then -cc_args=() -cc_args+=( $(k_arg SHA) $(v_arg SHA)) -cc_args+=( $(write_bool_args CC_FAIL_ON_ERROR) ) -cc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) -cc_args+=( $(k_arg SLUG) $(v_arg SLUG)) +cargs=() +cargs+=( $(k_arg SHA) $(v_arg SHA)) +cargs+=( $(write_bool_args CC_FAIL_ON_ERROR) ) +cargs+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) +cargs+=( $(k_arg SLUG) $(v_arg SLUG)) else exit_if_error "Invalid run command specified: $CC_RUN_CMD" exit @@ -248,12 +251,12 @@ fi unset NODE_OPTIONS # https://github.com/codecov/uploader/issues/475 say "$g==>$x Running $CC_RUN_CMD" -say " $b$cc_command $(echo "${cc_cli_args[@]}") $CC_RUN_CMD$token_str $(echo "${cc_args[@]}")$x" -if ! $cc_command \ - ${cc_cli_args[*]} \ +say " $b$ccommand $(echo "${ccli_args[@]}") $CC_RUN_CMD$token_str $(echo "${cargs[@]}")$x" +if ! $ccommand \ + ${ccli_args[*]} \ ${CC_RUN_CMD} \ ${token_arg[*]} \ - "${cc_args[@]}"; + "${cargs[@]}"; then exit_if_error "Failed to run $CC_RUN_CMD" fi diff --git a/package.py b/package.py index 64e3493..0807375 100644 --- a/package.py +++ b/package.py @@ -26,7 +26,7 @@ def package_scripts(source_dir, source_root, outfile): print(f"Current script is {len(''.join(lines))} (max: 8192) chars.") if len(''.join(lines)) > 8192: - print("Due to windows limitiations, script must be under 8192 chars.") + print("Due to windows limitations, script must be under 8192 chars.") exit(1) def _get_vars(line): @@ -58,7 +58,7 @@ def _parse(file): return lines def _shorten_line(line): - return line.replace("CODECOV", "CC").replace("codecov_", "cc_") + return line.replace("CODECOV", "CC").replace("codecov_", "c") def _get_script_from_line(line): matcher = r'\s*\. \.\/(\S+\.sh)$' #. ./version.sh diff --git a/scripts/set_empty_upload_args.sh b/scripts/set_empty_upload_args.sh index f4b0d21..8328da2 100755 --- a/scripts/set_empty_upload_args.sh +++ b/scripts/set_empty_upload_args.sh @@ -9,4 +9,4 @@ codecov_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) codecov_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA)) codecov_args+=( $(k_arg PR) $(v_arg PR)) codecov_args+=( $(k_arg SHA) $(v_arg SHA)) -codecov_args+=( $(k_arg SLUG) $(v_arg SLUG)) \ No newline at end of file +codecov_args+=( $(k_arg SLUG) $(v_arg SLUG)) From cbd9d4072efa644e72160afb93c66435dfbe9e42 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Mon, 10 Mar 2025 13:17:15 -0700 Subject: [PATCH 3/3] fix: update to get to the char limit --- dist/codecov.sh | 161 ++++++++++++------------- package.py | 2 +- scripts/run_command.sh | 3 +- scripts/set_empty_upload_args.sh | 2 - scripts/set_pr_base_picking_args.sh | 2 - scripts/set_send_notifications_args.sh | 2 - scripts/set_upload_coverage_args.sh | 2 - 7 files changed, 82 insertions(+), 92 deletions(-) diff --git a/dist/codecov.sh b/dist/codecov.sh index a671476..ee6e02d 100755 --- a/dist/codecov.sh +++ b/dist/codecov.sh @@ -52,8 +52,8 @@ if [ -n "$CC_BINARY" ]; then if [ -f "$CC_BINARY" ]; then - cfilename=$CC_BINARY - ccommand=$CC_BINARY + c_filename=$CC_BINARY + c_command=$CC_BINARY else exit_if_error "Could not find binary file $CC_BINARY" fi @@ -63,7 +63,7 @@ then exit_if_error "Could not install via pypi." exit fi - ccommand="codecovcli" + c_command="codecovcli" else if [ -n "$CC_OS" ]; then @@ -79,17 +79,17 @@ else [[ $(arch) == "aarch64" && $family == "linux" ]] && CC_OS+="-arm64" say "$g==>$x Detected $b${CC_OS}$x" fi - cfilename="codecov" - [[ $CC_OS == "windows" ]] && cfilename+=".exe" - ccommand="./$cfilename" + c_filename="codecov" + [[ $CC_OS == "windows" ]] && c_filename+=".exe" + c_command="./$c_filename" [[ $CC_OS == "macos" ]] && \ ! command -v gpg 2>&1 >/dev/null && \ HOMEBREW_NO_AUTO_UPDATE=1 brew install gpg - curl="https://cli.codecov.io" - curl="$curl/${CC_VERSION}" - curl="$curl/${CC_OS}/${cfilename}" - say "$g ->$x Downloading $b${curl}$x" - curl -O --retry 5 --retry-delay 2 "$curl" + c_url="https://cli.codecov.io" + c_url="$c_url/${CC_VERSION}" + c_url="$c_url/${CC_OS}/${c_filename}" + say "$g ->$x Downloading $b${c_url}$x" + curl -O --retry 5 --retry-delay 2 "$c_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" | tr \{ '\n' | tr , '\n' | tr \} '\n' | grep "\"version\"" | awk -F'"' '{print $4}' | tail -1) @@ -107,44 +107,44 @@ CC_PUBLIC_PGP_KEY=$(curl -s https://keybase.io/codecovsecurity/pgp_keys.asc) say "$g==>$x Verifying GPG signature integrity" sha_url="https://cli.codecov.io" sha_url="${sha_url}/${CC_VERSION}/${CC_OS}" - sha_url="${sha_url}/${cfilename}.SHA256SUM" + sha_url="${sha_url}/${c_filename}.SHA256SUM" say "$g ->$x Downloading $b${sha_url}$x" say "$g ->$x Downloading $b${sha_url}.sig$x" say " " curl -Os --retry 5 --retry-delay 2 --connect-timeout 2 "$sha_url" curl -Os --retry 5 --retry-delay 2 --connect-timeout 2 "${sha_url}.sig" - if ! gpg --verify "${cfilename}.SHA256SUM.sig" "${cfilename}.SHA256SUM"; + if ! gpg --verify "${c_filename}.SHA256SUM.sig" "${c_filename}.SHA256SUM"; then exit_if_error "Could not verify signature. Please contact Codecov if problem continues" fi - if ! (shasum -a 256 -c "${cfilename}.SHA256SUM" 2>/dev/null || \ - sha256sum -c "${cfilename}.SHA256SUM"); + if ! (shasum -a 256 -c "${c_filename}.SHA256SUM" 2>/dev/null || \ + sha256sum -c "${c_filename}.SHA256SUM"); then exit_if_error "Could not verify SHASUM. Please contact Codecov if problem continues" fi say "$g==>$x CLI integrity verified" say - chmod +x "$ccommand" + chmod +x "$c_command" fi if [ -n "$CC_BINARY_LOCATION" ]; then - mkdir -p "$CC_BINARY_LOCATION" && mv "$cfilename" $_ + mkdir -p "$CC_BINARY_LOCATION" && mv "$c_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 -ccli_args=() -ccli_args+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM)) -ccli_args+=( $(k_arg ENTERPRISE_URL) $(v_arg ENTERPRISE_URL)) +c_cli_args=() +c_cli_args+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM)) +c_cli_args+=( $(k_arg ENTERPRISE_URL) $(v_arg ENTERPRISE_URL)) if [ -n "$CC_YML_PATH" ] then - ccli_args+=( "--codecov-yml-path" ) - ccli_args+=( "$CC_YML_PATH" ) + c_cli_args+=( "--codecov-yml-path" ) + c_cli_args+=( "$CC_YML_PATH" ) fi -ccli_args+=( $(write_bool_args CC_DISABLE_TELEM) ) -ccli_args+=( $(write_bool_args CC_VERBOSE) ) +c_cli_args+=( $(write_bool_args CC_DISABLE_TELEM) ) +c_cli_args+=( $(write_bool_args CC_VERBOSE) ) if [ -n "$CC_TOKEN_VAR" ]; then token="$(eval echo \$$CC_TOKEN_VAR)" @@ -159,104 +159,101 @@ then token_str+=" -t " token_arg+=( " -t " "$token") fi +c_args=() if [ "$CC_RUN_CMD" == "upload-coverage" ]; then -cargs=() # Args for create commit -cargs+=( $(write_bool_args CC_FAIL_ON_ERROR) ) -cargs+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) -cargs+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA)) -cargs+=( $(k_arg PR) $(v_arg PR)) -cargs+=( $(k_arg SHA) $(v_arg SHA)) -cargs+=( $(k_arg SLUG) $(v_arg SLUG)) +c_args+=( $(write_bool_args CC_FAIL_ON_ERROR) ) +c_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) +c_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA)) +c_args+=( $(k_arg PR) $(v_arg PR)) +c_args+=( $(k_arg SHA) $(v_arg SHA)) +c_args+=( $(k_arg SLUG) $(v_arg SLUG)) # Args for create report -cargs+=( $(k_arg CODE) $(v_arg CODE)) +c_args+=( $(k_arg CODE) $(v_arg CODE)) # Args for do upload -cargs+=( $(k_arg ENV) $(v_arg ENV)) +c_args+=( $(k_arg ENV) $(v_arg ENV)) OLDIFS=$IFS;IFS=, -cargs+=( $(k_arg BRANCH) $(v_arg BRANCH)) -cargs+=( $(k_arg BUILD) $(v_arg BUILD)) -cargs+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL)) -cargs+=( $(k_arg DIR) $(v_arg DIR)) -cargs+=( $(write_bool_args CC_DISABLE_FILE_FIXES) ) -cargs+=( $(write_bool_args CC_DISABLE_SEARCH) ) -cargs+=( $(write_bool_args CC_DRY_RUN) ) +c_args+=( $(k_arg BRANCH) $(v_arg BRANCH)) +c_args+=( $(k_arg BUILD) $(v_arg BUILD)) +c_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL)) +c_args+=( $(k_arg DIR) $(v_arg DIR)) +c_args+=( $(write_bool_args CC_DISABLE_FILE_FIXES) ) +c_args+=( $(write_bool_args CC_DISABLE_SEARCH) ) +c_args+=( $(write_bool_args CC_DRY_RUN) ) if [ -n "$CC_EXCLUDES" ]; then for directory in $CC_EXCLUDES; do - cargs+=( "--exclude" "$directory" ) + c_args+=( "--exclude" "$directory" ) done fi if [ -n "$CC_FILES" ]; then for file in $CC_FILES; do - cargs+=( "--file" "$file" ) + c_args+=( "--file" "$file" ) done fi if [ -n "$CC_FLAGS" ]; then for flag in $CC_FLAGS; do - cargs+=( "--flag" "$flag" ) + c_args+=( "--flag" "$flag" ) done fi -cargs+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS)) -cargs+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE)) -cargs+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE)) -cargs+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE)) -cargs+=( $(write_bool_args CC_HANDLE_NO_REPORTS_FOUND) ) -cargs+=( $(write_bool_args CC_RECURSE_SUBMODULES) ) -cargs+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE)) -cargs+=( $(write_bool_args CC_LEGACY) ) +c_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS)) +c_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE)) +c_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE)) +c_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE)) +c_args+=( $(write_bool_args CC_HANDLE_NO_REPORTS_FOUND) ) +c_args+=( $(write_bool_args CC_RECURSE_SUBMODULES) ) +c_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE)) +c_args+=( $(write_bool_args CC_LEGACY) ) if [ -n "$CC_NAME" ]; then - cargs+=( "--name" "$CC_NAME" ) + c_args+=( "--name" "$CC_NAME" ) fi -cargs+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER)) -cargs+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX)) -cargs+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER)) +c_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER)) +c_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX)) +c_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER)) if [ -n "$CC_PLUGINS" ]; then for plugin in $CC_PLUGINS; do - cargs+=( "--plugin" "$plugin" ) + c_args+=( "--plugin" "$plugin" ) done fi -cargs+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE)) -cargs+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT)) +c_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE)) +c_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT)) IFS=$OLDIFS elif [ "$CC_RUN_CMD" == "empty-upload" ]; then -cargs=() -cargs+=( $(k_arg BRANCH) $(v_arg BRANCH)) -cargs+=( $(write_bool_args CC_FAIL_ON_ERROR) ) -cargs+=( $(write_bool_args CC_FORCE) ) -cargs+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) -cargs+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA)) -cargs+=( $(k_arg PR) $(v_arg PR)) -cargs+=( $(k_arg SHA) $(v_arg SHA)) -cargs+=( $(k_arg SLUG) $(v_arg SLUG)) +c_args+=( $(k_arg BRANCH) $(v_arg BRANCH)) +c_args+=( $(write_bool_args CC_FAIL_ON_ERROR) ) +c_args+=( $(write_bool_args CC_FORCE) ) +c_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) +c_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA)) +c_args+=( $(k_arg PR) $(v_arg PR)) +c_args+=( $(k_arg SHA) $(v_arg SHA)) +c_args+=( $(k_arg SLUG) $(v_arg SLUG)) elif [ "$CC_RUN_CMD" == "pr-base-picking" ]; then -cargs=() -cargs+=( $(k_arg BASE_SHA) $(v_arg BASE_SHA)) -cargs+=( $(k_arg PR) $(v_arg PR)) -cargs+=( $(k_arg SLUG) $(v_arg SLUG)) -cargs+=( $(k_arg SERVICE) $(v_arg SERVICE)) +c_args+=( $(k_arg BASE_SHA) $(v_arg BASE_SHA)) +c_args+=( $(k_arg PR) $(v_arg PR)) +c_args+=( $(k_arg SLUG) $(v_arg SLUG)) +c_args+=( $(k_arg SERVICE) $(v_arg SERVICE)) elif [ "$CC_RUN_CMD" == "send-notifications" ]; then -cargs=() -cargs+=( $(k_arg SHA) $(v_arg SHA)) -cargs+=( $(write_bool_args CC_FAIL_ON_ERROR) ) -cargs+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) -cargs+=( $(k_arg SLUG) $(v_arg SLUG)) +c_args+=( $(k_arg SHA) $(v_arg SHA)) +c_args+=( $(write_bool_args CC_FAIL_ON_ERROR) ) +c_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) +c_args+=( $(k_arg SLUG) $(v_arg SLUG)) else exit_if_error "Invalid run command specified: $CC_RUN_CMD" exit fi unset NODE_OPTIONS -# https://github.com/codecov/uploader/issues/475 +# github.com/codecov/uploader/issues/475 say "$g==>$x Running $CC_RUN_CMD" -say " $b$ccommand $(echo "${ccli_args[@]}") $CC_RUN_CMD$token_str $(echo "${cargs[@]}")$x" -if ! $ccommand \ - ${ccli_args[*]} \ +say " $b$c_command $(echo "${c_cli_args[@]}") $CC_RUN_CMD$token_str $(echo "${c_args[@]}")$x" +if ! $c_command \ + ${c_cli_args[*]} \ ${CC_RUN_CMD} \ ${token_arg[*]} \ - "${cargs[@]}"; + "${c_args[@]}"; then exit_if_error "Failed to run $CC_RUN_CMD" fi diff --git a/package.py b/package.py index 0807375..24857bd 100644 --- a/package.py +++ b/package.py @@ -58,7 +58,7 @@ def _parse(file): return lines def _shorten_line(line): - return line.replace("CODECOV", "CC").replace("codecov_", "c") + return line.replace("CODECOV", "CC").replace("codecov_", "c_") def _get_script_from_line(line): matcher = r'\s*\. \.\/(\S+\.sh)$' #. ./version.sh diff --git a/scripts/run_command.sh b/scripts/run_command.sh index 256ce7e..3a233fe 100755 --- a/scripts/run_command.sh +++ b/scripts/run_command.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash +codecov_args=() if [ "$CODECOV_RUN_CMD" == "upload-coverage" ]; then . ./set_upload_coverage_args.sh elif [ "$CODECOV_RUN_CMD" == "empty-upload" ]; then @@ -14,7 +15,7 @@ else fi unset NODE_OPTIONS -# https://github.com/codecov/uploader/issues/475 +# github.com/codecov/uploader/issues/475 say "$g==>$x Running $CODECOV_RUN_CMD" say " $b$codecov_command $(echo "${codecov_cli_args[@]}") $CODECOV_RUN_CMD$token_str $(echo "${codecov_args[@]}")$x" diff --git a/scripts/set_empty_upload_args.sh b/scripts/set_empty_upload_args.sh index 8328da2..099add9 100755 --- a/scripts/set_empty_upload_args.sh +++ b/scripts/set_empty_upload_args.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -codecov_args=() - codecov_args+=( $(k_arg BRANCH) $(v_arg BRANCH)) codecov_args+=( $(write_bool_args CODECOV_FAIL_ON_ERROR) ) codecov_args+=( $(write_bool_args CODECOV_FORCE) ) diff --git a/scripts/set_pr_base_picking_args.sh b/scripts/set_pr_base_picking_args.sh index 518249a..09d32aa 100755 --- a/scripts/set_pr_base_picking_args.sh +++ b/scripts/set_pr_base_picking_args.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -codecov_args=() - codecov_args+=( $(k_arg BASE_SHA) $(v_arg BASE_SHA)) codecov_args+=( $(k_arg PR) $(v_arg PR)) codecov_args+=( $(k_arg SLUG) $(v_arg SLUG)) diff --git a/scripts/set_send_notifications_args.sh b/scripts/set_send_notifications_args.sh index bffe320..13f99a9 100755 --- a/scripts/set_send_notifications_args.sh +++ b/scripts/set_send_notifications_args.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -codecov_args=() - codecov_args+=( $(k_arg SHA) $(v_arg SHA)) codecov_args+=( $(write_bool_args CODECOV_FAIL_ON_ERROR) ) codecov_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) diff --git a/scripts/set_upload_coverage_args.sh b/scripts/set_upload_coverage_args.sh index eace372..5adf8e3 100755 --- a/scripts/set_upload_coverage_args.sh +++ b/scripts/set_upload_coverage_args.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -codecov_args=() - # Args for create commit codecov_args+=( $(write_bool_args CODECOV_FAIL_ON_ERROR) ) codecov_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))