merge main into dana/commit-report-upload-args

.github/workflows/codeql-analysis.yml

@@ -37,11 +37,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v3.5.3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v2.21.2
       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@v2
+      uses: github/codeql-action/autobuild@v2.21.2
 
     # ℹ️ 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@v2
+      uses: github/codeql-action/analyze@v2.21.2

.github/workflows/main.yml

@@ -8,7 +8,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
       - name: Upload coverage to Codecov (script)
         uses: ./
         with:
@@ -40,7 +40,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
       - name: Install dependencies
         run: npm install
       - name: Lint

.github/workflows/scorecards-analysis.yml

@@ -24,12 +24,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3.0.0
+        uses: actions/checkout@v3.5.3 # v3.0.0
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
+        uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -56,6 +56,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@5f532563584d71fdef14ee64d17bafb34f751ce5 # v1.0.26
+        uses: github/codeql-action/upload-sarif@v2.21.2 # v1.0.26
         with:
           sarif_file: results.sarif

CHANGELOG.md

@@ -1,3 +1,57 @@
+## 3.1.4
+### Fixes
+- #967 Fix typo in README.md
+- #971 fix: add back in working dir
+- #969 fix: CLI option names for uploader
+
+### Dependencies
+- #970 build(deps-dev): bump @types/node from 18.15.12 to 18.16.3
+- #979 build(deps-dev): bump @types/node from 20.1.0 to 20.1.2
+- #981 build(deps-dev): bump @types/node from 20.1.2 to 20.1.4
+
+## 3.1.3
+### Fixes
+- #960 fix: allow for aarch64 build
+
+### Dependencies
+- #957 build(deps-dev): bump jest-junit from 15.0.0 to 16.0.0
+- #958 build(deps): bump openpgp from 5.7.0 to 5.8.0
+- #959 build(deps-dev): bump @types/node from 18.15.10 to 18.15.12
+
+## 3.1.2
+### Fixes
+- #718 Update README.md
+- #851 Remove unsupported path_to_write_report argument
+- #898 codeql-analysis.yml
+- #901 Update README to contain correct information - inputs and negate feature
+- #955 fix: add in all the extra arguments for uploader
+
+### Dependencies
+- #819 build(deps): bump openpgp from 5.4.0 to 5.5.0
+- #835 build(deps): bump node-fetch from 3.2.4 to 3.2.10
+- #840 build(deps): bump ossf/scorecard-action from 1.1.1 to 2.0.4
+- #841 build(deps): bump @actions/core from 1.9.1 to 1.10.0
+- #843 build(deps): bump @actions/github from 5.0.3 to 5.1.1
+- #869 build(deps): bump node-fetch from 3.2.10 to 3.3.0
+- #872 build(deps-dev): bump jest-junit from 13.2.0 to 15.0.0
+- #879 build(deps): bump decode-uri-component from 0.2.0 to 0.2.2
+- #889 build(deps): bump ossf/scorecard-action from 1.1.1 to 2.1.2
+- #895 build(deps): bump json5 from 2.2.1 to 2.2.3
+- #896 build(deps): bump actions/upload-artifact from 3.1.0 to 3.1.2
+- #900 build(deps-dev): bump @vercel/ncc from 0.34.0 to 0.36.1
+- #905 build(deps-dev): bump typescript from 4.7.4 to 4.9.5
+- #911 build(deps-dev): bump @types/node from 16.11.40 to 18.13.0
+- #922 build(deps-dev): bump @types/node from 18.13.0 to 18.14.0
+- #924 build(deps): bump openpgp from 5.5.0 to 5.7.0
+- #927 build(deps-dev): bump @types/node from 18.14.0 to 18.14.2
+- #933 build(deps-dev): bump @types/node from 18.14.2 to 18.14.6
+- #937 build(deps-dev): bump @types/node from 18.14.6 to 18.15.0
+- #938 build(deps): bump node-fetch from 3.3.0 to 3.3.1
+- #945 build(deps-dev): bump @types/node from 18.15.0 to 18.15.5
+- #946 build(deps-dev): bump @types/node from 18.15.5 to 18.15.6
+- #947 build(deps-dev): bump @types/node from 18.15.6 to 18.15.10
+- #951 build(deps): bump ossf/scorecard-action from 2.1.2 to 2.1.3
+
 ## 3.1.1
 ### Fixes
 - #661 Update deprecation warning

README.md

@@ -35,7 +35,7 @@ steps:
 - uses: actions/checkout@master
 - uses: codecov/codecov-action@v3
   with:
-    token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
+    token: ${{ secrets.CODECOV_TOKEN }}
     files: ./coverage1.xml,./coverage2.xml # optional
     flags: unittests # optional
     name: codecov-umbrella # optional
@@ -50,35 +50,44 @@ Codecov's Action supports inputs from the user. These inputs, along with their d
 
 | Input  | Description | Usage |
 | :---:     |     :---:   |    :---:   |
-| `token`  | Used to authorize coverage report uploads  | *Required for private repos* |
-| `files`  | Comma-separated paths to the coverage report(s). Negated paths are supported by starting with `!` | Optional
-| `directory` | Directory to search for coverage reports. | Optional
-| `dry_run` | Don't upload files to Codecov | Optional
-| `flags`  | Flag the upload to group coverage metrics (unittests, uitests, etc.). Multiple flags are separated by a comma (ui,chrome) | Optional
+| `token`  | Used to authorize coverage report uploads  | *Required |
+| `move_coverage_to_trash` | Move discovered coverage reports to the trash | Optional
 | `commit_parent` | The commit SHA of the parent for which you are uploading coverage. If not present, the parent will be determined using the API of your repository provider.  When using the repository provider's API, the parent is determined via finding the closest ancestor to the commit. | Optional
+| `dry_run` | Don't upload files to Codecov | Optional
 | `env_vars`  | Environment variables to tag the upload with. Multiple env variables can be separated with commas (e.g. `OS,PYTHON`) | Optional
 | `fail_ci_if_error`  | Specify if CI pipeline should fail when Codecov runs into errors during upload. *Defaults to **false*** | Optional
+| `files`  | Comma-separated paths to the coverage report(s). Negated paths are supported by starting with `!` | Optional
+| `flags`  | Flag the upload to group coverage metrics (unittests, uitests, etc.). Multiple flags are separated by a comma (ui,chrome) | Optional
+| `full_report` | Specify the path of a full Codecov report to re-upload | Optional
 | `functionalities` | Toggle functionalities | Optional
-| `network` | Disable uploading the file network | Optional
+| -- `network` | Disable uploading the file network | Optional
+| -- `fixes` | Enable file fixes to ignore common lines from coverage | Optional
+| -- `search` | Disable searching for coverage files | Optional
 | `gcov` | Run with gcov support | Optional
 | `gcov_args` | Extra arguments to pass to gcov | Optional
 | `gcov_ignore` | Paths to ignore during gcov gathering | Optional
 | `gcov_include` | Paths to include during gcov gathering | Optional
-| `move_coverage_to_trash` | Move discovered coverage reports to the trash | Optional
+| `gcov_executable` | gcov executable to run. Defaults to gcov. | Optional
 | `name`  | Custom defined name for the upload | Optional
+| `network_filter` | Specify a filter on the files listed in the network section of the Codecov report. Useful for upload-specific path fixing | Optional
+| `network_prefix` | Specify a prefix on files listed in the network section of the Codecov report. Useful to help resolve path fixing | Optional
+| `os` | Specify the OS (linux, macos, windows, alpine) | Optional
 | `override_branch` | Specify the branch name | Optional
 | `override_build` | Specify the build number | Optional
 | `override_commit` | Specify the commit SHA | Optional
 | `override_pr` | Specify the pull request number | Optional
 | `override_tag` | Specify the git tag | Optional
 | `root_dir` | Used when not in git/hg project to identify project root directory | Optional
+| `directory` | Directory to search for coverage reports. | Optional
 | `slug` | Specify the slug manually (Enterprise use) | Optional
+| `swift` | Run with swift coverage support | Optional
+| -- `swift_project` | Specify the swift project to speed up coverage conversion | Optional
+| `upstream_proxy` | The upstream http proxy server to connect through | Optional
 | `url` | Change the upload host (Enterprise use) | Optional
 | `verbose` | Specify whether the Codecov output should be verbose | Optional
 | `version` | Specify which version of the Codecov Uploader should be used. Defaults to `latest` | Optional
 | `working-directory` | Directory in which to execute `codecov.sh` | Optional
-| `xcode` | Run with xcode support | Optional
-| `xcode_archive_path` | Specify the xcode archive path. Likely specified as the -resultBundlePath and should end in .xcresult | Optional
+| `xtra_args` | Add additional uploader args that may be missing in the Action | Optional
 
 
 ### Example `workflow.yml` with Codecov Action
@@ -94,13 +103,13 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     env:
       OS: ${{ matrix.os }}
-      PYTHON: '3.7'
+      PYTHON: '3.10'
     steps:
     - uses: actions/checkout@master
     - name: Setup Python
       uses: actions/setup-python@master
       with:
-        python-version: 3.7
+        python-version: 3.10
     - name: Generate coverage report
       run: |
         pip install pytest

action.yml

@@ -5,6 +5,9 @@ inputs:
   token:
     description: 'Repository upload token - get it from codecov.io. Required only for private repositories'
     required: false
+  file:
+    description: 'Path to coverage file to upload'
+    required: false
   files:
     description: 'Comma-separated list of files to upload'
     required: false
@@ -14,6 +17,9 @@ inputs:
   flags:
     description: 'Flag upload to group coverage metrics (e.g. unittests | integration | ui,chrome)'
     required: false
+  full_report:
+    description: Specify the path of a full Codecov report to re-upload
+    required: false
   commit_parent:
     description: 'The commit SHA of the parent for which you are uploading coverage. If not present, the parent will be determined using the API of your repository provider.  When using the repository providers API, the parent is determined via finding the closest ancestor to the commit.'
     required: false
@@ -26,18 +32,18 @@ inputs:
   fail_ci_if_error:
     description: 'Specify whether or not CI build should fail if Codecov runs into an error during upload'
     required: false
-  file:
-    description: 'Path to coverage file to upload'
-    required: false
   functionalities:
-    description: 'Comma-separated list, see the README for options and their usage'
+    description: 'Comma-separated list, see the README for options and their usage. Options include `network`, `fixes`, `search`.'
     required: false
   gcov:
     description: 'Run with gcov support'
     required: false
   gcov_args:
     description: 'Extra arguments to pass to gcov'
     required: false
+  gcov_executable:
+    description: 'gcov executable to run. Defaults to gcov'
+    required: false
   gcov_ignore:
     description: 'Paths to ignore during gcov gathering'
     required: false
@@ -50,6 +56,15 @@ inputs:
   name:
     description: 'User defined upload name. Visible in Codecov UI'
     required: false
+  network_filter:
+    description: 'Specify a filter on the files listed in the network section of the Codecov report. Useful for upload-specific path fixing'
+    required: false
+  network_prefix:
+    description: 'Specify a prefix on files listed in the network section of the Codecov report. Useful to help resolve path fixing'
+    required: false
+  os:
+    description: 'Override the assumed OS. Options are aarch64 | alpine | linux | macos | windows.'
+    required: false
   override_branch:
     description: 'Specify the branch name'
     required: false
@@ -65,15 +80,21 @@ inputs:
   override_tag:
     description: 'Specify the git tag'
     required: false
-  os:
-    description: 'Override the assumed OS. Options are alpine | linux | macos | windows.'
-    required: false
   root_dir:
     description: 'Used when not in git/hg project to identify project root directory'
     required: false
   slug:
     description: 'Specify the slug manually (Enterprise use)'
     required: false
+  swift:
+    description: 'Run with swift coverage support'
+    required: false
+  swift_project:
+    description: 'Specify the swift project to speed up coverage conversion'
+    required: false
+  upstream_proxy:
+    description: 'The upstream http proxy server to connect through'
+    required: false
   url:
     description: 'Change the upload host (Enterprise use)'
     required: false
@@ -92,6 +113,9 @@ inputs:
   xcode_archive_path:
     description: 'Specify the xcode archive path. Likely specified as the -resultBundlePath and should end in .xcresult'
     required: false
+  xtra_args:
+    description: 'Add additional uploader args that may be missing in the Action'
+    required: false
 branding:
   color: 'red'
   icon: 'umbrella'