fix: use audience

.github/workflows/codeql-analysis.yml

@@ -41,7 +41,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3.27.5
+      uses: github/codeql-action/init@v3.27.4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3.27.5
+      uses: github/codeql-action/autobuild@v3.27.4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3.27.5
+      uses: github/codeql-action/analyze@v3.27.4

.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 }}

.github/workflows/scorecards-analysis.yml

@@ -57,6 +57,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@v3.27.5 # v1.0.26
+        uses: github/codeql-action/upload-sarif@v3.27.4 # v1.0.26
         with:
           sarif_file: results.sarif

CHANGELOG.md

@@ -1,55 +1,3 @@
-## v5.1.0
-### What's Changed
-* fix: hide unnecessary error on shasum by @thomasrockhu-codecov in https://github.com/codecov/codecov-action/pull/1692
-* build(deps): bump github/codeql-action from 3.27.4 to 3.27.5 by @app/dependabot in https://github.com/codecov/codecov-action/pull/1701
-* chore(release): wrapper-0.0.29 by @app/codecov-releaser-app in https://github.com/codecov/codecov-action/pull/1713
-
-
-**Full Changelog**: https://github.com/codecov/codecov-action/compare/v5.0.7..v5.1.0
-
-## v5.0.7
-### What's Changed
-* fix: use HEAD_REPO by @thomasrockhu-codecov in https://github.com/codecov/codecov-action/pull/1690
-
-
-**Full Changelog**: https://github.com/codecov/codecov-action/compare/v5.0.6..v5.0.7
-
-## v5.0.6
-### What's Changed
-* fix: update CODECOV_TOKEN and fix tokenless by @thomasrockhu-codecov in https://github.com/codecov/codecov-action/pull/1688
-
-
-**Full Changelog**: https://github.com/codecov/codecov-action/compare/v5.0.5..v5.0.6
-
-## v5.0.5
-### What's Changed
-* chore(release): wrapper-0.0.27 by @app/codecov-releaser-app in https://github.com/codecov/codecov-action/pull/1685
-
-
-**Full Changelog**: https://github.com/codecov/codecov-action/compare/v5.0.4..v5.0.5
-
-## 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
-* fix: use double-quotes for OIDC by @thomasrockhu-codecov in https://github.com/codecov/codecov-action/pull/1669
-* fix: prevent always setting tokenless to be true by @thomasrockhu-codecov in https://github.com/codecov/codecov-action/pull/1673
-* fix: update CHANGELOG and automate by @thomasrockhu-codecov in https://github.com/codecov/codecov-action/pull/1674
-* fix: bump to v5 and update README by @thomasrockhu-codecov in https://github.com/codecov/codecov-action/pull/1655
-* build(deps): bump github/codeql-action from 3.27.0 to 3.27.4 by @app/dependabot in https://github.com/codecov/codecov-action/pull/1665
-* fix: typo in `inputs.disable_safe_directory` by @mkroening in https://github.com/codecov/codecov-action/pull/1666
-
-
-**Full Changelog**: https://github.com/codecov/codecov-action/compare/v5.0.2..v5.0.3
-
 ## v5.0.2
 ### What's Changed
 * fix: override commit and pr values for PR cases by @thomasrockhu-codecov in https://github.com/codecov/codecov-action/pull/1657

action.yml

@@ -154,11 +154,6 @@ 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
@@ -173,13 +168,10 @@ 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
-            CC_TOKEN=$(echo ${{ inputs.token }} | tr -d '\n')
+            CC_TOKEN=${{ inputs.token }}
             echo "CC_TOKEN=$CC_TOKEN" >> "$GITHUB_ENV"
           fi
         fi
@@ -187,7 +179,7 @@ runs:
     - name: Override branch for forks
       shell: bash
       run: |
-        if [ -z "$CC_BRANCH" ] && [ -z "$CC_TOKEN" ] && [ -n "$GITHUB_EVENT_PULL_REQUEST_HEAD_REPO_FULL_NAME" ] && [ "${GITHUB_EVENT_PULL_REQUEST_HEAD_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"
@@ -199,7 +191,7 @@ runs:
       env:
         CC_BRANCH: ${{ inputs.override_branch }}
         GITHUB_EVENT_PULL_REQUEST_HEAD_LABEL: ${{ github.event.pull_request.head.label }}
-        GITHUB_EVENT_PULL_REQUEST_HEAD_REPO_FULL_NAME: ${{ github.event.pull_request.head.repo.full_name }}
+        GITHUB_EVENT_PULL_REQUEST_REPO_FULL_NAME: ${{ github.event.pull_request.repo.full_name }}
         GITHUB_REPOSITORY: ${{ github.repository }}
 
     - name: Override commits and pr for pull requests

changelog.py

@@ -15,14 +15,14 @@ def update_changelog():
     if previous == version:
         print(f"No changes to version {version}")
         return
-    print(f"Adding logs from {previous}..v{version}")
+    print(f"Adding logs from {previous}..{version}")
 
     raw_current_branch = subprocess.run([
         "git",
         "branch",
         "--show-current",
     ], capture_output=True)
-    current_branch = raw_current_branch.stdout.decode('utf-8').strip()
+    current_branch = raw_current_branch.stdout.decode('utf-8')
 
     raw_commits = subprocess.run([
         "git",
@@ -31,12 +31,9 @@ def update_changelog():
         "--oneline",
     ], capture_output=True)
     commits = [line[:7] for line in raw_commits.stdout.decode('utf-8').split('\n')]
-    print(commits)
 
     prs = set()
     for commit in commits:
-        if not commit:
-            continue
         commit_output = subprocess.run([
             'gh',
             'pr',
@@ -45,16 +42,8 @@ def update_changelog():
             'author,number,title,url',
             '--search',
             f'"{commit}"',
-            '--state',
-            'merged',
         ], capture_output=True)
-
+        commit_details = json.loads(commit_output.stdout.decode('utf-8'))[0]
-        commit_details = commit_output.stdout.decode('utf-8')
-        if not commit_details or not json.loads(commit_details):
-            continue
-        commit_details = json.loads(commit_details)[0]
-
-
         if not commit_details['number']:
             continue
         if commit_details['number'] in prs:
@@ -63,7 +52,7 @@ def update_changelog():
         changelog.append(f"* {commit_details['title']} by @{commit_details['author']['login']} in {commit_details['url']}")
 
     changelog.append('\n')
-    changelog.append(f"**Full Changelog**: https://github.com/codecov/codecov-action/compare/{previous}..v{version}\n")
+    changelog.append(f"**Full Changelog**: https://github.com/codecov/codecov-action/compare/{previous}..{version}\n")
 
     with open('CHANGELOG.md', 'r') as f:
         for line in f:

dist/codecov.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
-CC_WRAPPER_VERSION="0.0.29"
+CC_WRAPPER_VERSION="0.0.24"
 set +u
 say() {
   echo -e "$1"
 }
 exit_if_error() {
   say "$r==> $1$x"
-  if [ "$CC_FAIL_ON_ERROR" = true ];
+  if [ $CC_FAIL_ON_ERROR = true ];
   then
      say "$r    Exiting...$x"
      exit 1;
@@ -15,16 +15,10 @@ exit_if_error() {
 lower() {
   echo $(echo $1 | sed 's/CC//' | sed 's/_/-/g' | tr '[:upper:]' '[:lower:]')
 }
-k_arg() {
+write_existing_args() {
-  if [ -n "$(eval echo \$"CC_$1")" ];
+  if [ -n "$(eval echo \$$1)" ];
   then
-    echo "--$(lower "$1")"
+    echo " -$(lower "$1") $(eval echo \$$1)"
-  fi
-}
-v_arg() {
-  if [ -n "$(eval echo \$"CC_$1")" ];
-  then
-    echo "$(eval echo \$"CC_$1")"
   fi
 }
 write_truthy_args() {
@@ -84,10 +78,10 @@ else
   cc_url="$cc_url/${CC_VERSION}"
   cc_url="$cc_url/${cc_os}/${cc_filename}"
   say "$g ->$x Downloading $b${cc_url}$x"
-  curl -Os "$cc_url"
+  curl -Os $cc_url
   say "$g==>$x Finishing downloading $b${cc_os}:${CC_VERSION}$x"
   version_url="https://cli.codecov.io/${cc_os}/${CC_VERSION}"
-  version=$(curl -s "$version_url" -H "Accept:application/json" | jq -r '.version')
+  version=$(curl -s $version_url -H "Accept:application/json" | jq -r '.version')
   say "      Version: $b$version$x"
   say " "
 fi
@@ -112,7 +106,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"
@@ -121,74 +115,77 @@ CC_PUBLIC_PGP_KEY=$(curl -s https://keybase.io/codecovsecurity/pgp_keys.asc)
   say
 fi
 cc_cli_args=()
-cc_cli_args+=( $(k_arg AUTO_LOAD_PARAMS_FROM) $(v_arg AUTO_LOAD_PARAMS_FROM))
+cc_cli_args+=( $(write_existing_args CC_AUTO_LOAD_PARAMS_FROM) )
-cc_cli_args+=( $(k_arg ENTERPRISE_URL) $(v_arg ENTERPRISE_URL))
+cc_cli_args+=( $(write_existing_args CC_ENTERPRISE_URL) )
-if [ -n "$CC_YML_PATH" ]
+cc_cli_args+=( $(write_existing_args 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=()
+cc_cc_args=()
-# Args for create commit
+cc_cc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
-cc_uc_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
+cc_cc_args+=( $(write_existing_args CC_GIT_SERVICE) )
-cc_uc_args+=( $(k_arg GIT_SERVICE) $(v_arg GIT_SERVICE))
+cc_cc_args+=( $(write_existing_args CC_PARENT_SHA) )
-cc_uc_args+=( $(k_arg PARENT_SHA) $(v_arg PARENT_SHA))
+cc_cc_args+=( $(write_existing_args CC_PR) )
-cc_uc_args+=( $(k_arg PR) $(v_arg PR))
+cc_cc_args+=( $(write_existing_args CC_SHA) )
-cc_uc_args+=( $(k_arg SHA) $(v_arg SHA))
+cc_cc_args+=( $(write_existing_args CC_SLUG) )
-cc_uc_args+=( $(k_arg SLUG) $(v_arg SLUG))
+cc_create_report_args=()
-# Args for create report
+cc_cr_args+=( $(write_existing_args CC_CODE) )
-cc_uc_args+=( $(k_arg CODE) $(v_arg CODE))
+cc_cr_args+=( $(write_truthy_args CC_FAIL_ON_ERROR) )
-# Args for do upload
+cc_cr_args+=( $(write_existing_args CC_GIT_SERVICE) )
-cc_uc_args+=( $(k_arg ENV) $(v_arg ENV))
+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_du_args=()
+cc_du_args+=( $(write_existing_args CC_ENV) )
 OLDIFS=$IFS;IFS=,
-cc_uc_args+=( $(k_arg BRANCH) $(v_arg BRANCH))
+cc_du_args+=( $(write_existing_args CC_BRANCH) )
-cc_uc_args+=( $(k_arg BUILD) $(v_arg BUILD))
+cc_du_args+=( $(write_existing_args CC_BUILD) )
-cc_uc_args+=( $(k_arg BUILD_URL) $(v_arg BUILD_URL))
+cc_du_args+=( $(write_existing_args CC_BUILD_URL) )
-cc_uc_args+=( $(k_arg DIR) $(v_arg DIR))
+cc_du_args+=( $(write_existing_args CC_CODE) )
-cc_uc_args+=( $(write_truthy_args CC_DISABLE_FILE_FIXES) )
+cc_du_args+=( $(write_existing_args CC_DIR) )
-cc_uc_args+=( $(write_truthy_args CC_DISABLE_SEARCH) )
+cc_du_args+=( $(write_truthy_args CC_DISABLE_FILE_FIXES) )
-cc_uc_args+=( $(write_truthy_args CC_DRY_RUN) )
+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_du_args+=( $(write_existing_args CC_GCOV_ARGS) )
-cc_uc_args+=( $(k_arg GCOV_EXECUTABLE) $(v_arg GCOV_EXECUTABLE))
+cc_du_args+=( $(write_existing_args CC_GCOV_EXECUTABLE) )
-cc_uc_args+=( $(k_arg GCOV_IGNORE) $(v_arg GCOV_IGNORE))
+cc_du_args+=( $(write_existing_args CC_GCOV_IGNORE) )
-cc_uc_args+=( $(k_arg GCOV_INCLUDE) $(v_arg GCOV_INCLUDE))
+cc_du_args+=( $(write_existing_args CC_GCOV_INCLUDE) )
-cc_uc_args+=( $(write_truthy_args CC_HANDLE_NO_REPORTS_FOUND) )
+cc_du_args+=( $(write_existing_args CC_GIT_SERVICE) )
-cc_uc_args+=( $(k_arg JOB_CODE) $(v_arg JOB_CODE))
+cc_du_args+=( $(write_truthy_args CC_HANDLE_NO_REPORTS_FOUND) )
-cc_uc_args+=( $(write_truthy_args CC_LEGACY) )
+cc_du_args+=( $(write_existing_args CC_JOB_CODE) )
-if [ -n "$CC_NAME" ];
+cc_du_args+=( $(write_truthy_args CC_LEGACY) )
-then
+cc_du_args+=( $(write_existing_args CC_NAME) )
-  cc_uc_args+=( "--name" "$CC_NAME" )
+cc_du_args+=( $(write_existing_args CC_NETWORK_FILTER) )
-fi
+cc_du_args+=( $(write_existing_args CC_NETWORK_PREFIX) )
-cc_uc_args+=( $(k_arg NETWORK_FILTER) $(v_arg NETWORK_FILTER))
+cc_du_args+=( $(write_existing_args CC_NETWORK_ROOT_FOLDER) )
-cc_uc_args+=( $(k_arg NETWORK_PREFIX) $(v_arg NETWORK_PREFIX))
-cc_uc_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_du_args+=( $(write_existing_args CC_PR) )
-cc_uc_args+=( $(k_arg SWIFT_PROJECT) $(v_arg SWIFT_PROJECT))
+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) )
 IFS=$OLDIFS
 unset NODE_OPTIONS
 # See https://github.com/codecov/uploader/issues/475
@@ -207,13 +204,35 @@ then
   token_str+=" -t <redacted>"
   token_arg+=( " -t " "$token")
 fi
-say "$g==>$x Running upload-coverage"
+say "$g==>$x Running create-commit"
-say "      $b./$cc_filename $(echo "${cc_cli_args[@]}") upload-coverage$token_str $(echo "${cc_uc_args[@]}")$x"
+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

hooks/pre-commit

@@ -9,5 +9,3 @@ git diff --cached --name-only | if grep --quiet "src/version"
 then
     python changelog.py
 fi
-
-git add CHANGELOG.md

src/version

@@ -1 +1 @@
-CODECOV_ACTION_VERSION="5.1.0"
+CODECOV_ACTION_VERSION="5.0.2"