fix: update CODECOV_TOKEN if set with env

.github/workflows/main.yml

@@ -44,7 +44,7 @@ jobs:
           files: ./coverage/calculator/coverage-final.json,./coverage/coverage-test/coverage-final.json,./coverage/coverage-final.json
           flags: version,${{ matrix.os }}
           name: codecov-version
-          version: v9.1.0
+          version: v0.8.0
           verbose: true
           token: ${{ secrets.CODECOV_TOKEN }}
 
@@ -93,7 +93,7 @@ jobs:
           files: ./coverage/calculator/coverage-final.json,./coverage/coverage-test/coverage-final.json,./coverage/coverage-final.json
           flags: version,maxos-latest-xlarge
           name: codecov-version
-          version: v9.1.0
+          version: v0.8.0
           verbose: true
           token: ${{ secrets.CODECOV_TOKEN }}
 
@@ -130,6 +130,6 @@ jobs:
           files: ./coverage/calculator/coverage-final.json,./coverage/coverage-test/coverage-final.json,./coverage/coverage-final.json
           flags: version,${{ matrix.os }}
           name: codecov-version
-          version: v9.1.0
+          version: v0.8.0
           verbose: true
           token: ${{ secrets.CODECOV_TOKEN }}

action.yml

@@ -173,6 +173,9 @@ runs:
           # {"count":1984,"value":"***"}
           CC_TOKEN=$(curl -H "Authorization: bearer $ACTIONS_ID_TOKEN_REQUEST_TOKEN" "$ACTIONS_ID_TOKEN_REQUEST_URL&audience=https://codecov.io" | cut -d\" -f6)
           echo "CC_TOKEN=$CC_TOKEN" >> "$GITHUB_ENV"
+        elif [ -n "${{ env.CODECOV_TOKEN }}" ];
+        then
+            echo "CC_TOKEN=${{ env.CODECOV_TOKEN }}" >> "$GITHUB_ENV"
         else
           if [ -n ${{ inputs.token }} ];
           then
@@ -184,7 +187,7 @@ runs:
     - name: Override branch for forks
       shell: bash
       run: |
-        if [ -z "$CC_BRANCH" ] && [ -z "$CC_TOKEN" ] && [ -n "$GITHUB_EVENT_PULL_REQUEST_REPO_FULL_NAME"] && [ "${GITHUB_EVENT_PULL_REQUEST_REPO_FULL_NAME}" != "$GITHUB_REPOSITORY" ];
+        if [ -z "$CC_BRANCH" ] && [ -z "$CC_TOKEN" ] && [ -n "$GITHUB_EVENT_PULL_REQUEST_REPO_FULL_NAME" ] && [ "${GITHUB_EVENT_PULL_REQUEST_REPO_FULL_NAME}" != "$GITHUB_REPOSITORY" ];
         then
           echo -e "\033[0;32m==>\033[0m Fork detected, tokenless uploading used"
           TOKENLESS="$GITHUB_EVENT_PULL_REQUEST_HEAD_LABEL"

dist/codecov.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-CC_WRAPPER_VERSION="0.0.28"
+CC_WRAPPER_VERSION="0.0.27"
 set +u
 say() {
   echo -e "$1"
@@ -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" 2>/dev/null || \
+  if ! (shasum -a 256 -c "${cc_filename}.SHA256SUM" || \
     sha256sum -c "${cc_filename}.SHA256SUM");
   then
     exit_if_error "Could not verify SHASUM. Please contact Codecov if problem continues"
@@ -123,72 +123,78 @@ 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))
-if [ -n $CC_YML_PATH ]
-then
-  cc_cli_args+=( "--codecov-yml-path" )
-  cc_cli_args+=( "$CC_YML_PATH" )
-fi
+cc_cli_args+=( $(k_arg YML_PATH) $(v_arg YML_PATH))
 cc_cli_args+=( $(write_truthy_args CC_VERBOSE) )
-cc_uc_args=()
-# Args for create commit
-cc_uc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
-cc_uc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
-cc_uc_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
-cc_uc_args+=( $(k_arg PR) $(v_arg PR))
-cc_uc_args+=( $(k_arg SHA) $(v_arg SHA))
-cc_uc_args+=( $(k_arg SLUG) $(v_arg SLUG))
-# Args for create report
-cc_uc_args+=( $(k_arg CODE) $(v_arg CODE))
-# Args for do upload
-cc_uc_args+=( $(k_arg ENV) $(v_arg ENV))
+cc_cc_args=()
+cc_cc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
+cc_cc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
+cc_cc_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
+cc_cc_args+=( $(k_arg PR) $(v_arg PR))
+cc_cc_args+=( $(k_arg SHA) $(v_arg SHA))
+cc_cc_args+=( $(k_arg SLUG) $(v_arg SLUG))
+cc_create_report_args=()
+cc_cr_args+=( $(k_arg CODE) $(v_arg CODE))
+cc_cr_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
+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+=( $(k_arg ENV) $(v_arg ENV))
 OLDIFS=$IFS;IFS=,
-cc_uc_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
-cc_uc_args+=( $(k_arg BUILD) $(v_arg BUILD))
-cc_uc_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
-cc_uc_args+=( $(k_arg DIR) $(v_arg DIR))
-cc_uc_args+=( $(write_truthy_args CC_DISABLE_FILE_FIXES) )
-cc_uc_args+=( $(write_truthy_args CC_DISABLE_SEARCH) )
-cc_uc_args+=( $(write_truthy_args CC_DRY_RUN) )
+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_uc_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_uc_args+=( "--file" "$file" )
+    cc_du_args+=( "--file" "$file" )
   done
 fi
 if [ -n "$CC_FLAGS" ];
 then
   for flag in $CC_FLAGS; do
-    cc_uc_args+=( "--flag" "$flag" )
+    cc_du_args+=( "--flag" "$flag" )
   done
 fi
-cc_uc_args+=( $(k_arg GCOV_ARGS) $(v_arg GCOV_ARGS))
-cc_uc_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
-cc_uc_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
-cc_uc_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
-cc_uc_args+=( $(write_truthy_args CC_HANDLE_NO_REPORTS_FOUND) )
-cc_uc_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
-cc_uc_args+=( $(write_truthy_args CC_LEGACY) )
+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+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
+cc_du_args+=( $(write_truthy_args CC_LEGACY) )
 if [ -n "$CC_NAME" ];
 then
-  cc_uc_args+=( "--name" "$CC_NAME" )
+  cc_du_args+=( "--name" "$CC_NAME" )
 fi
-cc_uc_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
-cc_uc_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
-cc_uc_args+=( $(k_arg NETWORK_ROOT_FOLDER) $(v_arg NETWORK_ROOT_FOLDER))
+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_uc_args+=( "--plugin" "$plugin" )
+    cc_du_args+=( "--plugin" "$plugin" )
   done
 fi
-cc_uc_args+=( $(k_arg REPORT_TYPE) $(v_arg REPORT_TYPE))
-cc_uc_args+=( $(k_arg SWIFT_PROJECT) $(v_arg 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
@@ -207,13 +213,35 @@ then
   token_str+=" -t <redacted>"
   token_arg+=( " -t " "$token")
 fi
-say "$g==>$x Running upload-coverage"
-say "      $b./$cc_filename $(echo "${cc_cli_args[@]}") upload-coverage$token_str $(echo "${cc_uc_args[@]}")$x"
+say "$g==>$x Running create-commit"
+say "      $b./$cc_filename $(echo "${cc_cli_args[@]}") create-commit$token_str $(echo "${cc_cc_args[@]}")$x"
 if ! ./$cc_filename \
   ${cc_cli_args[*]} \
-  upload-coverage \
+  create-commit \
   ${token_arg[*]} \
-  "${cc_uc_args[@]}";
+  "${cc_cc_args[@]}";
 then
-  exit_if_error "Failed to upload coverage"
+  exit_if_error "Failed to create-commit"
+fi
+say " "
+say "$g==>$x Running create-report"
+say "      $b./$cc_filename $(echo "${cc_cli_args[@]}") create-report$token_str $(echo "${cc_cr_args[@]}")$x"
+if ! ./$cc_filename \
+  ${cc_cli_args[*]} \
+  create-report \
+  ${token_arg[*]} \
+  "${cc_cr_args[@]}";
+then
+  exit_if_error "Failed to create-report"
+fi
+say " "
+say "$g==>$x Running do-upload"
+say "      $b./$cc_filename $(echo "${cc_cli_args[@]}") do-upload$token_str $(echo "${cc_du_args[@]}")$x"
+if ! ./$cc_filename \
+  ${cc_cli_args[*]} \
+  do-upload \
+  ${token_arg[*]} \
+  "${cc_du_args[@]}";
+then
+  exit_if_error "Failed to upload"
 fi