Merge branch 'main' into tony/use-upload-coverage

codecov · Nov 26, 2024 · 70c2e45 · 70c2e45
2 parents ca5c41a + 588410f
commit 70c2e45
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/dist/codecov.sh b/dist/codecov.sh
@@ -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"
@@ -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_uc_args=()
 # Args for create commit

diff --git a/scripts/set_cli_args.sh b/scripts/set_cli_args.sh
@@ -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) )
diff --git a/scripts/validate.sh b/scripts/validate.sh
@@ -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"