Skip to content

Commit dce3261

Browse files
Merge pull request #31 from codecov/th/fix-codecov-yml-path
fix: force --codecov-yml-path
2 parents 09d9636 + c19bf59 commit dce3261

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

dist/codecov.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ CC_PUBLIC_PGP_KEY=$(curl -s https://keybase.io/codecovsecurity/pgp_keys.asc)
112112
then
113113
exit_if_error "Could not verify signature. Please contact Codecov if problem continues"
114114
fi
115-
if ! (shasum -a 256 -c "${cc_filename}.SHA256SUM" || \
115+
if ! (shasum -a 256 -c "${cc_filename}.SHA256SUM" 2>/dev/null || \
116116
sha256sum -c "${cc_filename}.SHA256SUM");
117117
then
118118
exit_if_error "Could not verify SHASUM. Please contact Codecov if problem continues"
@@ -123,7 +123,11 @@ fi
123123
cc_cli_args=()
124124
cc_cli_args+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM))
125125
cc_cli_args+=( $(k_arg ENTERPRISE_URL) $(v_arg ENTERPRISE_URL))
126-
cc_cli_args+=( $(k_arg YML_PATH) $(v_arg YML_PATH))
126+
if [ -n $CC_YML_PATH ]
127+
then
128+
cc_cli_args+=( "--codecov-yml-path" )
129+
cc_cli_args+=( "$CC_YML_PATH" )
130+
fi
127131
cc_cli_args+=( $(write_truthy_args CC_VERBOSE) )
128132
cc_cc_args=()
129133
cc_cc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )

scripts/set_cli_args.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,9 @@ codecov_cli_args=()
44

55
codecov_cli_args+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM))
66
codecov_cli_args+=( $(k_arg ENTERPRISE_URL) $(v_arg ENTERPRISE_URL))
7-
codecov_cli_args+=( $(k_arg YML_PATH) $(v_arg YML_PATH))
7+
if [ -n $CODECOV_YML_PATH ]
8+
then
9+
codecov_cli_args+=( "--codecov-yml-path" )
10+
codecov_cli_args+=( "$CODECOV_YML_PATH" )
11+
fi
812
codecov_cli_args+=( $(write_truthy_args CODECOV_VERBOSE) )

scripts/validate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ else
2424
exit_if_error "Could not verify signature. Please contact Codecov if problem continues"
2525
fi
2626

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

0 commit comments

Comments
 (0)