diff --git a/CHANGELOG.md b/CHANGELOG.md index 4af06b0607..f70d7aa87b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## v5.0.4 +### What's Changed +* chore(deps): bump wrapper to 0.0.26 by @thomasrockhu-codecov in https://github.com/codecov/codecov-action/pull/1681 +* fix: strip out a trailing \/n from input tokens by @thomasrockhu-codecov in https://github.com/codecov/codecov-action/pull/1679 +* fix: add action version by @thomasrockhu-codecov in https://github.com/codecov/codecov-action/pull/1678 + + +**Full Changelog**: https://github.com/codecov/codecov-action/compare/v5.0.3..v5.0.4 + ## v5.0.3 ### What's Changed * fix: update OIDC audience by @thomasrockhu-codecov in https://github.com/codecov/codecov-action/pull/1675 diff --git a/action.yml b/action.yml index f2fa3ab90e..b3ec2321f6 100644 --- a/action.yml +++ b/action.yml @@ -154,6 +154,11 @@ branding: runs: using: "composite" steps: + - name: Action version + shell: bash + run: | + CC_ACTION_VERSION=$(cat ${GITHUB_ACTION_PATH}/src/version | grep 'CODECOV_ACTION_VERSION=' | cut -d\" -f2) + echo -e "\033[0;32m==>\033[0m Running Action version $CC_ACTION_VERSION" - name: Set safe directory if: ${{ inputs.disable_safe_directory != 'true' }} shell: bash @@ -171,7 +176,7 @@ runs: else if [ -n ${{ inputs.token }} ]; then - CC_TOKEN=${{ inputs.token }} + CC_TOKEN=$(echo ${{ inputs.token }} | tr -d '\n') echo "CC_TOKEN=$CC_TOKEN" >> "$GITHUB_ENV" fi fi diff --git a/dist/codecov.sh b/dist/codecov.sh index f32ee2f66b..f52c1c6e2a 100755 --- a/dist/codecov.sh +++ b/dist/codecov.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -CC_WRAPPER_VERSION="0.0.24" +CC_WRAPPER_VERSION="0.0.26" set +u say() { echo -e "$1" @@ -15,16 +15,22 @@ exit_if_error() { lower() { echo $(echo $1 | sed 's/CC//' | sed 's/_/-/g' | tr '[:upper:]' '[:lower:]') } -write_existing_args() { - if [ -n "$(eval echo \$$1)" ]; +k_arg() { + if [ -n "$(eval echo \$"CC_$1")" ]; then - echo " -$(lower "$1") $(eval echo \$$1)" + echo "--$(lower "$1")" + fi +} +v_arg() { + if [ -n "$(eval echo \$"CC_$1")" ]; + then + echo "$(eval echo \$"CC_$1")" fi } write_truthy_args() { if [ "$(eval echo \$$1)" = "true" ] || [ "$(eval echo \$$1)" = "1" ]; then - echo " -$(lower $1)" + echo "-$(lower $1)" fi } b="\033[0;36m" # variables/constants @@ -115,77 +121,80 @@ CC_PUBLIC_PGP_KEY=$(curl -s https://keybase.io/codecovsecurity/pgp_keys.asc) say fi cc_cli_args=() -cc_cli_args+=( $(write_existing_args CC_AUTO_LOAD_PARAMS_FROM) ) -cc_cli_args+=( $(write_existing_args CC_ENTERPRISE_URL) ) -cc_cli_args+=( $(write_existing_args CC_YML_PATH) ) +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)) +cc_cli_args+=( $(k_arg YML_PATH) $(v_arg YML_PATH)) cc_cli_args+=( $(write_truthy_args CC_VERBOSE) ) cc_cc_args=() cc_cc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) ) -cc_cc_args+=( $(write_existing_args CC_GIT_SERVICE) ) -cc_cc_args+=( $(write_existing_args CC_PARENT_SHA) ) -cc_cc_args+=( $(write_existing_args CC_PR) ) -cc_cc_args+=( $(write_existing_args CC_SHA) ) -cc_cc_args+=( $(write_existing_args CC_SLUG) ) +cc_du_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) +cc_du_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA)) +cc_du_args+=( $(k_arg PR) $(v_arg PR)) +cc_du_args+=( $(k_arg SHA) $(v_arg SHA)) +cc_du_args+=( $(k_arg SLUG) $(v_arg SLUG)) cc_create_report_args=() -cc_cr_args+=( $(write_existing_args CC_CODE) ) +cc_cr_args+=( $(k_arg CODE) $(v_arg CODE)) cc_cr_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) ) -cc_cr_args+=( $(write_existing_args CC_GIT_SERVICE) ) -cc_cr_args+=( $(write_existing_args CC_PR) ) -cc_cr_args+=( $(write_existing_args CC_SHA) ) -cc_cr_args+=( $(write_existing_args CC_SLUG) ) +cc_cr_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) +cc_cr_args+=( $(k_arg PR) $(v_arg PR)) +cc_cr_args+=( $(k_arg SHA) $(v_arg SHA)) +cc_cr_args+=( $(k_arg SLUG) $(v_arg SLUG)) cc_du_args=() -cc_du_args+=( $(write_existing_args CC_ENV) ) +cc_du_args+=( $(k_arg ENV) $(v_arg ENV)) OLDIFS=$IFS;IFS=, -cc_du_args+=( $(write_existing_args CC_BRANCH) ) -cc_du_args+=( $(write_existing_args CC_BUILD) ) -cc_du_args+=( $(write_existing_args CC_BUILD_URL) ) -cc_du_args+=( $(write_existing_args CC_CODE) ) -cc_du_args+=( $(write_existing_args CC_DIR) ) +cc_du_args+=( $(k_arg BRANCH) $(v_arg BRANCH)) +cc_du_args+=( $(k_arg BUILD) $(v_arg BUILD)) +cc_du_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL)) +cc_du_args+=( $(k_arg CODE) $(v_arg CODE)) +cc_du_args+=( $(k_arg DIR) $(v_arg DIR)) cc_du_args+=( $(write_truthy_args CC_DISABLE_FILE_FIXES) ) cc_du_args+=( $(write_truthy_args CC_DISABLE_SEARCH) ) cc_du_args+=( $(write_truthy_args CC_DRY_RUN) ) if [ -n "$CC_EXCLUDES" ]; then for directory in $CC_EXCLUDES; do - cc_du_args+=( " --exclude " "$directory" ) + cc_du_args+=( "--exclude" "$directory" ) done fi cc_du_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) ) if [ -n "$CC_FILES" ]; then for file in $CC_FILES; do - cc_du_args+=( " --file " "$file" ) + cc_du_args+=( "--file" "$file" ) done fi if [ -n "$CC_FLAGS" ]; then for flag in $CC_FLAGS; do - cc_du_args+=( " --flag " "$flag" ) + cc_du_args+=( "--flag" "$flag" ) done fi -cc_du_args+=( $(write_existing_args CC_GCOV_ARGS) ) -cc_du_args+=( $(write_existing_args CC_GCOV_EXECUTABLE) ) -cc_du_args+=( $(write_existing_args CC_GCOV_IGNORE) ) -cc_du_args+=( $(write_existing_args CC_GCOV_INCLUDE) ) -cc_du_args+=( $(write_existing_args CC_GIT_SERVICE) ) +cc_du_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS)) +cc_du_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE)) +cc_du_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE)) +cc_du_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE)) +cc_du_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE)) cc_du_args+=( $(write_truthy_args CC_HANDLE_NO_REPORTS_FOUND) ) -cc_du_args+=( $(write_existing_args CC_JOB_CODE) ) +cc_du_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE)) cc_du_args+=( $(write_truthy_args CC_LEGACY) ) -cc_du_args+=( $(write_existing_args CC_NAME) ) -cc_du_args+=( $(write_existing_args CC_NETWORK_FILTER) ) -cc_du_args+=( $(write_existing_args CC_NETWORK_PREFIX) ) -cc_du_args+=( $(write_existing_args CC_NETWORK_ROOT_FOLDER) ) +if [ -n "$CC_NAME" ]; +then + cc_du_args+=( "--name" "$CC_NAME" ) +fi +cc_du_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER)) +cc_du_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX)) +cc_du_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER)) if [ -n "$CC_PLUGINS" ]; then for plugin in $CC_PLUGINS; do - cc_du_args+=( " --plugin " "$plugin" ) + cc_du_args+=( "--plugin" "$plugin" ) done fi -cc_du_args+=( $(write_existing_args CC_PR) ) -cc_du_args+=( $(write_existing_args CC_REPORT_TYPE) ) -cc_du_args+=( $(write_existing_args CC_SHA) ) -cc_du_args+=( $(write_existing_args CC_SLUG) ) -cc_du_args+=( $(write_existing_args CC_SWIFT_PROJECT) ) +cc_du_args+=( $(k_arg PR) $(v_arg PR)) +cc_du_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE)) +cc_du_args+=( $(k_arg SHA) $(v_arg SHA)) +cc_du_args+=( $(k_arg SLUG) $(v_arg SLUG)) +cc_du_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT)) IFS=$OLDIFS unset NODE_OPTIONS # See https://github.com/codecov/uploader/issues/475 @@ -210,7 +219,7 @@ if ! ./$cc_filename \ ${cc_cli_args[*]} \ create-commit \ ${token_arg[*]} \ - ${cc_cc_args[*]}; + "${cc_cc_args[@]}"; then exit_if_error "Failed to create-commit" fi @@ -221,7 +230,7 @@ if ! ./$cc_filename \ ${cc_cli_args[*]} \ create-report \ ${token_arg[*]} \ - ${cc_cr_args[*]}; + "${cc_cr_args[@]}"; then exit_if_error "Failed to create-report" fi @@ -232,7 +241,7 @@ if ! ./$cc_filename \ ${cc_cli_args[*]} \ do-upload \ ${token_arg[*]} \ - ${cc_du_args[*]}; + "${cc_du_args[@]}"; then exit_if_error "Failed to upload" fi diff --git a/src/scripts b/src/scripts index 25f50b4c5b..21e5116d8e 160000 --- a/src/scripts +++ b/src/scripts @@ -1 +1 @@ -Subproject commit 25f50b4c5b5c0c94e7af4776c06b22762a18389c +Subproject commit 21e5116d8ef0bbdaf71d7479c705b6768dfec547 diff --git a/src/version b/src/version index a0f7001f08..b5427f24c3 100644 --- a/src/version +++ b/src/version @@ -1 +1 @@ -CODECOV_ACTION_VERSION="5.0.3" +CODECOV_ACTION_VERSION="5.0.4"