Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: force --codecov-yml-path #31

Merged
merged 2 commits into from
Nov 21, 2024
Merged

fix: force --codecov-yml-path #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43d9f95
fix: force --codecov-yml-path
thomasrockhu-codecov Nov 21, 2024
c19bf59
fix: hide stderr from shasum as its unnecessary
thomasrockhu-codecov Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions dist/codecov.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ CC_PUBLIC_PGP_KEY=$(curl -s https://keybase.io/codecovsecurity/pgp_keys.asc)
then
exit_if_error "Could not verify signature. Please contact Codecov if problem continues"
fi
if ! (shasum -a 256 -c "${cc_filename}.SHA256SUM" || \
if ! (shasum -a 256 -c "${cc_filename}.SHA256SUM" 2>/dev/null || \
sha256sum -c "${cc_filename}.SHA256SUM");
then
exit_if_error "Could not verify SHASUM. Please contact Codecov if problem continues"
Expand All @@ -123,7 +123,11 @@ 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))
cc_cli_args+=( $(k_arg YML_PATH) $(v_arg YML_PATH))
if [ -n $CC_YML_PATH ]
then
cc_cli_args+=( "--codecov-yml-path" )
cc_cli_args+=( "$CC_YML_PATH" )
fi
cc_cli_args+=( $(write_truthy_args CC_VERBOSE) )
cc_cc_args=()
cc_cc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
Expand Down
6 changes: 5 additions & 1 deletion scripts/set_cli_args.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,9 @@ codecov_cli_args=()

codecov_cli_args+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM))
codecov_cli_args+=( $(k_arg ENTERPRISE_URL) $(v_arg ENTERPRISE_URL))
codecov_cli_args+=( $(k_arg YML_PATH) $(v_arg YML_PATH))
if [ -n $CODECOV_YML_PATH ]
then
codecov_cli_args+=( "--codecov-yml-path" )
codecov_cli_args+=( "$CODECOV_YML_PATH" )
fi
codecov_cli_args+=( $(write_truthy_args CODECOV_VERBOSE) )
2 changes: 1 addition & 1 deletion scripts/validate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ else
exit_if_error "Could not verify signature. Please contact Codecov if problem continues"
fi

if ! (shasum -a 256 -c "${codecov_filename}.SHA256SUM" || \
if ! (shasum -a 256 -c "${codecov_filename}.SHA256SUM" 2>/dev/null || \
sha256sum -c "${codecov_filename}.SHA256SUM");
then
exit_if_error "Could not verify SHASUM. Please contact Codecov if problem continues"
Expand Down
Loading