4.0.0-beta.2 (#1086)

* chore(release): 4.0.0-beta.1

* fix: typo

.github/workflows/codeql-analysis.yml

@@ -1,5 +1,4 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
+
 #
 # You may wish to alter this file to override the set of languages analyzed,
 # or to provide custom queries or build logic.
@@ -38,11 +37,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4.0.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v2.21.5
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,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.5
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +66,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v2.21.5

.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@v4.0.0
       - name: Upload coverage to Codecov (script)
         uses: ./
         with:
@@ -16,6 +16,7 @@ jobs:
           flags: script,${{ matrix.os }}
           name: codecov-script
           verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}
       - name: Upload coverage to Codecov (demo)
         uses: ./
         with:
@@ -24,6 +25,7 @@ jobs:
           flags: demo,${{ matrix.os }}
           name: codecov-demo
           verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}
       - name: Upload coverage to Codecov (version)
         uses: ./
         with:
@@ -31,8 +33,9 @@ jobs:
           file: ./coverage/coverage-final.json
           flags: version,${{ matrix.os }}
           name: codecov-version
-          version: v0.1.0_8880
+          version: v0.2.0
           verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}
   run:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -40,7 +43,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.0.0
       - name: Install dependencies
         run: npm install
       - name: Lint
@@ -54,6 +57,7 @@ jobs:
           flags: script,${{ matrix.os }}
           name: codecov-script
           verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}
       - name: Upload coverage to Codecov (demo)
         uses: ./
         with:
@@ -62,6 +66,7 @@ jobs:
           flags: demo,${{ matrix.os }}
           name: codecov-demo
           verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}
       - name: Upload coverage to Codecov (version)
         uses: ./
         with:
@@ -69,5 +74,6 @@ jobs:
           file: ./coverage/coverage-final.json
           flags: version,${{ matrix.os }}
           name: codecov-version
-          version: v0.1.0_8880
+          version: v0.2.0
           verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/scorecards-analysis.yml

@@ -24,12 +24,12 @@ jobs:
     
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # v3.0.0
+        uses: actions/checkout@v4.0.0 # v3.0.0
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@3e15ea8318eee9b333819ec77a36aca8d39df13e # v1.1.1
+        uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -48,7 +48,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: SARIF file
           path: results.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.5 # v1.0.26
         with:
           sarif_file: results.sarif

CHANGELOG.md

@@ -1,3 +1,70 @@
+## 4.0.0-beta.2
+### Fixes
+- #1085 not adding -n if empty to do-upload command
+
+## 4.0.0-beta.1
+
+`v4` represents a move from the [universal uploader](https://github.com/codecov/uploader) to the [Codecov CLI](https://github.com/codecov/codecov-cli). Although this will unlock new features for our users, the CLI is not yet at feature parity with the universal uploader.
+
+### Breaking Changes
+- No current support for `aarch64` and `alpine` architectures.
+- Tokenless uploading is unsuported
+- Various arguments to the Action have been removed
+
+## 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

@@ -5,7 +5,15 @@
 [![Workflow for Codecov Action](https://github.com/codecov/codecov-action/actions/workflows/main.yml/badge.svg)](https://github.com/codecov/codecov-action/actions/workflows/main.yml)
 ### Easily upload coverage reports to Codecov from GitHub Actions
 
->The latest release of this Action adds support for tokenless uploads from GitHub Actions!
+## v4 Beta Release
+`v4` of the Codecov GitHub Action will use the [Codecov CLI](https://github.com/codecov/codecov-cli) to upload coverage reports to Codecov. Currently, `v4` is in beta.
+
+Breaking Changes
+- No current support for `aarch64` and `alpine` architectures.
+- Tokenless uploading is unsupported
+- Various arguments to the Action have been removed
+
+`v3` versions and below will not have access to CLI features (e.g. global upload token).
 
 ## ⚠️  Deprecation of v1
 **As of February 1, 2022, v1 has been fully sunset and no longer functions**
@@ -16,12 +24,6 @@ more about our deprecation plan and the new uploader on our [blog](https://about
 
 We will be restricting any updates to the `v1` Action to security updates and hotfixes.
 
-### Migration from `v1` to `v3`
-The `v3` uploader has a few breaking changes for users
-- Multiple fields have not been transferred from the bash uploader or have been deprecated. Notably
-many of the `functionalities` and `gcov_` arguments have been removed. Please check the documentation
-below for the full list.
-
 ## Usage
 
 To integrate Codecov with your Actions pipeline, specify the name of this repository with a tag number (`@v3` is recommended) as a `step` within your `workflow.yml` file.
@@ -35,7 +37,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
@@ -46,40 +48,48 @@ steps:
 
 ## Arguments
 
-Codecov's Action currently supports five inputs from the user: `token`, `file`, `flags`,`name`, and `fail_ci_if_error`. These inputs, along with their descriptions and usage contexts, are listed in the table below:
+Codecov's Action supports inputs from the user. These inputs, along with their descriptions and usage contexts, are listed in the table below:
 
 | Input  | Description | Usage |
 | :---:     |     :---:   |    :---:   |
-| `token`  | Used to authorize coverage report uploads  | *Required for private repos* |
-| `files`  | Comma-separated paths to the coverage report(s) | 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
-| `path_to_write_report` | Write upload file to path before uploading | 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
@@ -95,13 +105,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
@@ -114,10 +124,9 @@ jobs:
         directory: ./coverage/reports/
         env_vars: OS,PYTHON
         fail_ci_if_error: true
-        files: ./coverage1.xml,./coverage2.xml
+        files: ./coverage1.xml,./coverage2.xml,!./cache
         flags: unittests
         name: codecov-umbrella
-        path_to_write_report: ./coverage/codecov_report.txt
         verbose: true
 ```
 ## Contributing

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,9 +17,6 @@ inputs:
   flags:
     description: 'Flag upload to group coverage metrics (e.g. unittests | integration | ui,chrome)'
     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
   dry_run:
     description: "Don't upload files to Codecov"
     required: false
@@ -26,30 +26,15 @@ 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'
-    required: false
   gcov:
     description: 'Run with gcov support'
     required: false
-  gcov_args:
-    description: 'Extra arguments to pass to gcov'
-    required: false
-  gcov_ignore:
-    description: 'Paths to ignore during gcov gathering'
-    required: false
-  gcov_include:
-    description: 'Paths to include during gcov gathering'
-    required: false
-  move_coverage_to_trash:
-    description: 'Move discovered coverage reports to the trash'
-    required: false
   name:
     description: 'User defined upload name. Visible in Codecov UI'
     required: false
+  os:
+    description: 'Override the assumed OS. Options are linux | macos | windows.'
+    required: false
   override_branch:
     description: 'Specify the branch name'
     required: false
@@ -62,36 +47,21 @@ inputs:
   override_pr:
     description: 'Specify the pull request number'
     required: false
-  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
-  url:
-    description: 'Change the upload host (Enterprise use)'
-    required: false
   verbose:
     description: 'Specify whether the Codecov output should be verbose'
     required: false
   version:
-    description: 'Specify which version of the Codecov Uploader should be used. Defaults to `latest`'
+    description: 'Specify which version of the Codecov CLI should be used. Defaults to `latest`'
     required: false
   working-directory:
     description: 'Directory in which to execute codecov.sh'
     required: false
-  xcode:
-    description: 'Run with xcode support'
-    required: false
-  xcode_archive_path:
-    description: 'Specify the xcode archive path. Likely specified as the -resultBundlePath and should end in .xcresult'
-    required: false
 branding:
   color: 'red'
   icon: 'umbrella'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codecov-action",
-  "version": "3.1.1",
+  "version": "4.0.0-beta.2",
   "description": "Upload coverage reports to Codecov from GitHub Actions",
   "main": "index.js",
   "scripts": {
@@ -23,23 +23,23 @@
   },
   "homepage": "https://github.com/codecov/codecov-action#readme",
   "dependencies": {
-    "@actions/core": "^1.9.1",
+    "@actions/core": "^1.10.1",
     "@actions/exec": "^1.1.1",
-    "@actions/github": "^5.0.3",
-    "node-fetch": "^3.2.4",
-    "openpgp": "5.4"
+    "@actions/github": "^5.1.1",
+    "node-fetch": "^3.3.2",
+    "openpgp": "5.10"
   },
   "devDependencies": {
-    "@types/jest": "^27.5.0",
-    "@types/node": "^16.11.40",
-    "@typescript-eslint/eslint-plugin": "^4.29.2",
-    "@typescript-eslint/parser": "^4.29.2",
-    "@vercel/ncc": "^0.34.0",
-    "eslint": "^7.32.0",
+    "@types/jest": "^29.5.4",
+    "@types/node": "^20.6.0",
+    "@typescript-eslint/eslint-plugin": "^6.7.0",
+    "@typescript-eslint/parser": "^6.7.0",
+    "@vercel/ncc": "^0.38.0",
+    "eslint": "^8.49.0",
     "eslint-config-google": "^0.14.0",
-    "jest": "^26.6.3",
-    "jest-junit": "^13.2.0",
-    "ts-jest": "^26.5.6",
-    "typescript": "^4.7.4"
+    "jest": "^29.6.4",
+    "jest-junit": "^16.0.0",
+    "ts-jest": "^29.1.1",
+    "typescript": "^5.2.0"
   }
 }

src/buildExec.test.ts

@@ -1,31 +1,55 @@
 import * as github from '@actions/github';
 
-import buildExec from './buildExec';
+import {
+  buildCommitExec,
+  buildGeneralExec,
+  buildReportExec,
+  buildUploadExec,
+} from './buildExec';
 
-/* eslint-disable  @typescript-eslint/no-var-requires */
-const {version} = require('../package.json');
 
 const context = github.context;
 
-test('no arguments', () => {
-  const {execArgs, failCi} = buildExec();
-
-  const args = [
-    '-n',
-    '',
-    '-Q',
-    `github-action-${version}`,
-  ];
-  if (context.eventName == 'pull_request') {
-    args.push('-C', `${context.payload.pull_request.head.sha}`);
+test('general args', () => {
+  const envs = {
+    url: 'https://codecov.enterprise.com',
+    verbose: 't',
+  };
+  for (const env of Object.keys(envs)) {
+    process.env['INPUT_' + env.toUpperCase()] = envs[env];
+  }
+
+  const {args, verbose} = buildGeneralExec();
+
+  expect(args).toEqual(
+      expect.arrayContaining([
+        '--enterprise-url',
+        'https://codecov.enterprise.com',
+        '-v',
+      ]));
+  expect(verbose).toBeTruthy();
+  for (const env of Object.keys(envs)) {
+    delete process.env['INPUT_' + env.toUpperCase()];
   }
-  expect(execArgs).toEqual(args);
-  expect(failCi).toBeFalsy();
 });
 
-test('all arguments', () => {
+
+test('upload args using context', () => {
+  const expectedArgs = [];
+  const {uploadExecArgs, uploadCommand} = buildUploadExec();
+  if (context.eventName == 'pull_request') {
+    expectedArgs.push('-C', `${context.payload.pull_request.head.sha}`);
+  }
+  if (context.eventName == 'pull_request_target') {
+    expectedArgs.push('-P', `${context.payload.number}`);
+  }
+
+  expect(uploadExecArgs).toEqual(expectedArgs);
+  expect(uploadCommand).toEqual('do-upload');
+});
+
+test('upload args', () => {
   const envs = {
-    'commit_parent': '83231650328f11695dfb754ca0f540516f188d27',
     'directory': 'coverage/',
     'dry_run': 'true',
     'env_vars': 'OS,PYTHON',
@@ -33,48 +57,29 @@ test('all arguments', () => {
     'file': 'coverage.xml',
     'files': 'dir1/coverage.xml,dir2/coverage.xml',
     'flags': 'test,test2',
-    'functionalities':
-      'network',
-    'gcov': 'true',
-    'gcov_args': '-v',
-    'gcov_ignore': '*.fake',
-    'gcov_include': 'real_file',
-    'move_coverage_to_trash': 'true',
     'name': 'codecov',
     'override_branch': 'thomasrockhu/test',
     'override_build': '1',
     'override_commit': '9caabca5474b49de74ef5667deabaf74cdacc244',
     'override_pr': '2',
-    'override_tag': 'v1.2',
-    'path_to_write_report': 'codecov/',
     'root_dir': 'root/',
     'slug': 'fakeOwner/fakeRepo',
     'token': 'd3859757-ab80-4664-924d-aef22fa7557b',
-    'url': 'https://codecov.enterprise.com',
-    'verbose': 't',
     'working-directory': 'src',
-    'xcode': 'true',
-    'xcode_archive_path': '/test.xcresult',
+    'plugin': 'xcode',
+    'exclude': 'src',
   };
-
   for (const env of Object.keys(envs)) {
     process.env['INPUT_' + env.toUpperCase()] = envs[env];
   }
 
-  const {execArgs, failCi} = buildExec();
-  expect(execArgs).toEqual([
+  const {uploadExecArgs, uploadCommand} = buildUploadExec();
+  const expectedArgs = [
     '-n',
     'codecov',
-    '-Q',
-    `github-action-${version}`,
-    '-c',
-    '-N',
-    '83231650328f11695dfb754ca0f540516f188d27',
     '-d',
     '-e',
     'OS,PYTHON',
-    '-X',
-    'network',
     '-Z',
     '-f',
     'coverage.xml',
@@ -86,13 +91,6 @@ test('all arguments', () => {
     'test',
     '-F',
     'test2',
-    '-g',
-    '--gcovArgs',
-    '-v',
-    '--gcovIgnore',
-    '*.fake',
-    '--gcovInclude',
-    'real_file',
     '-B',
     'thomasrockhu/test',
     '-b',
@@ -101,105 +99,119 @@ test('all arguments', () => {
     '9caabca5474b49de74ef5667deabaf74cdacc244',
     '-P',
     '2',
-    '-T',
-    'v1.2',
-    '-R',
+    '--network-root-folder',
     'root/',
     '-s',
     'coverage/',
     '-r',
     'fakeOwner/fakeRepo',
-    '-u',
-    'https://codecov.enterprise.com',
-    '-v',
-    '--xc',
-    '--xp',
-    '/test.xcresult',
-  ]);
-  expect(failCi).toBeTruthy();
+    '--plugin',
+    'xcode',
+    '--exclude',
+    'src',
+  ];
 
+  expect(uploadExecArgs).toEqual(expectedArgs);
+  expect(uploadCommand).toEqual('do-upload');
   for (const env of Object.keys(envs)) {
     delete process.env['INPUT_' + env.toUpperCase()];
   }
 });
 
-describe('trim arguments after splitting them', () => {
-  const baseExpectation = [
-    '-n',
-    expect.stringContaining(''),
-    '-Q',
-    expect.stringContaining('github-action'),
-  ];
 
-  test('files', () => {
-    const envs = {'files': './client-coverage.txt, ./lcov.info'};
+test('report args', () => {
+  const envs = {
+    override_commit: '9caabca5474b49de74ef5667deabaf74cdacc244',
+    slug: 'fakeOwner/fakeRepo',
+    token: 'd3859757-ab80-4664-924d-aef22fa7557b',
+  };
+  for (const env of Object.keys(envs)) {
+    process.env['INPUT_' + env.toUpperCase()] = envs[env];
+  }
 
-    for (const [name, value] of Object.entries(envs)) {
-      process.env['INPUT_' + name.toUpperCase()] = value;
-    }
+  const {reportExecArgs, reportCommand} = buildReportExec();
 
-    const {execArgs} = buildExec();
-
-    expect(execArgs).toEqual(
-        expect.arrayContaining([
-          ...baseExpectation,
-          '-f',
-          './client-coverage.txt',
-          '-f',
-          './lcov.info',
-        ]),
-    );
-
-    for (const env of Object.keys(envs)) {
-      delete process.env['INPUT_' + env.toUpperCase()];
-    }
-  });
-
-  test('flags', () => {
-    const envs = {'flags': 'ios, mobile'};
-
-    for (const [name, value] of Object.entries(envs)) {
-      process.env['INPUT_' + name.toUpperCase()] = value;
-    }
-
-    const {execArgs} = buildExec();
-
-    expect(execArgs).toEqual(
-        expect.arrayContaining([
-          ...baseExpectation,
-          '-F',
-          'ios',
-          '-F',
-          'mobile',
-        ]),
-    );
-
-    for (const env of Object.keys(envs)) {
-      delete process.env['INPUT_' + env.toUpperCase()];
-    }
-  });
-
-  test('functionalities', () => {
-    const envs = {'functionalities': 'network, gcov'};
-
-    for (const [name, value] of Object.entries(envs)) {
-      process.env['INPUT_' + name.toUpperCase()] = value;
-    }
-
-    const {execArgs} = buildExec();
-
-    expect(execArgs).toEqual(
-        expect.arrayContaining([
-          ...baseExpectation,
-          '-X',
-          'network',
-          '-X',
-          'gcov',
-        ]),
-    );
-
-    for (const env of Object.keys(envs)) {
-      delete process.env['INPUT_' + env.toUpperCase()];
-    }
-  });
+  expect(reportExecArgs).toEqual(
+      expect.arrayContaining([
+        '-C',
+        '9caabca5474b49de74ef5667deabaf74cdacc244',
+        '--slug',
+        'fakeOwner/fakeRepo',
+      ]));
+  expect(reportCommand).toEqual('create-report');
+  for (const env of Object.keys(envs)) {
+    delete process.env['INPUT_' + env.toUpperCase()];
+  }
+});
+
+
+test('report args using context', () => {
+  const envs = {
+    token: 'd3859757-ab80-4664-924d-aef22fa7557b',
+  };
+  for (const env of Object.keys(envs)) {
+    process.env['INPUT_' + env.toUpperCase()] = envs[env];
+  }
+  const expectedArgs : string[] = [];
+  if (context.eventName == 'pull_request') {
+    expectedArgs.push('-C', `${context.payload.pull_request.head.sha}`);
+  }
+
+  const {reportExecArgs, reportCommand} = buildReportExec();
+
+  expect(reportExecArgs).toEqual(expectedArgs);
+  expect(reportCommand).toEqual('create-report');
+  for (const env of Object.keys(envs)) {
+    delete process.env['INPUT_' + env.toUpperCase()];
+  }
+});
+
+
+test('commit args', () => {
+  const envs = {
+    override_commit: '9caabca5474b49de74ef5667deabaf74cdacc244',
+    slug: 'fakeOwner/fakeRepo',
+    token: 'd3859757-ab80-4664-924d-aef22fa7557b',
+    override_branch: 'thomasrockhu/test',
+    override_pr: '2',
+    commit_parent: '83231650328f11695dfb754ca0f540516f188d27',
+  };
+  for (const env of Object.keys(envs)) {
+    process.env['INPUT_' + env.toUpperCase()] = envs[env];
+  }
+
+  const {commitExecArgs, commitCommand} = buildCommitExec();
+
+  expect(commitExecArgs).toEqual(
+      expect.arrayContaining([
+        '-C',
+        '9caabca5474b49de74ef5667deabaf74cdacc244',
+        '--slug',
+        'fakeOwner/fakeRepo',
+        '-B',
+        'thomasrockhu/test',
+        '--pr',
+        '2',
+        '--parent-sha',
+        '83231650328f11695dfb754ca0f540516f188d27',
+      ]));
+  expect(commitCommand).toEqual('create-commit');
+  for (const env of Object.keys(envs)) {
+    delete process.env['INPUT_' + env.toUpperCase()];
+  }
+});
+
+test('commit args using context', () => {
+  const expectedArgs :string[] = [];
+
+  const {commitExecArgs, commitCommand} = buildCommitExec();
+  if (context.eventName == 'pull_request') {
+    expectedArgs.push('-C', `${context.payload.pull_request.head.sha}`);
+  }
+  if (context.eventName == 'pull_request_target') {
+    expectedArgs.push('-P', `${context.payload.number}`);
+  }
+
+  expect(commitExecArgs).toEqual(expectedArgs);
+  expect(commitCommand).toEqual('create-commit');
 });

src/buildExec.ts

@@ -1,7 +1,8 @@
+/* eslint-disable  @typescript-eslint/no-explicit-any */
+
 import * as core from '@actions/core';
 import * as github from '@actions/github';
 
-import {version} from '../package.json';
 
 const context = github.context;
 
@@ -16,48 +17,141 @@ const isTrue = (variable) => {
   );
 };
 
-const buildExec = () => {
-  const clean = core.getInput('move_coverage_to_trash');
+
+const buildCommitExec = () => {
   const commitParent = core.getInput('commit_parent');
+  const overrideBranch = core.getInput('override_branch');
+  const overrideCommit = core.getInput('override_commit');
+  const overridePr = core.getInput('override_pr');
+  const slug = core.getInput('slug');
+  const token = core.getInput('token');
+
+
+  const commitCommand = 'create-commit';
+  const commitExecArgs = [];
+
+  const commitOptions:any = {};
+  commitOptions.env = Object.assign(process.env, {
+    GITHUB_ACTION: process.env.GITHUB_ACTION,
+    GITHUB_RUN_ID: process.env.GITHUB_RUN_ID,
+    GITHUB_REF: process.env.GITHUB_REF,
+    GITHUB_REPOSITORY: process.env.GITHUB_REPOSITORY,
+    GITHUB_SHA: process.env.GITHUB_SHA,
+    GITHUB_HEAD_REF: process.env.GITHUB_HEAD_REF || '',
+  });
+
+
+  if (token) {
+    commitOptions.env.CODECOV_TOKEN = token;
+  }
+  if (commitParent) {
+    commitExecArgs.push('--parent-sha', `${commitParent}`);
+  }
+
+  if (overrideBranch) {
+    commitExecArgs.push('-B', `${overrideBranch}`);
+  }
+  if (overrideCommit) {
+    commitExecArgs.push('-C', `${overrideCommit}`);
+  } else if (
+    `${context.eventName}` == 'pull_request' ||
+    `${context.eventName}` == 'pull_request_target'
+  ) {
+    commitExecArgs.push('-C', `${context.payload.pull_request.head.sha}`);
+  }
+  if (overridePr) {
+    commitExecArgs.push('--pr', `${overridePr}`);
+  } else if (
+    `${context.eventName}` == 'pull_request_target'
+  ) {
+    commitExecArgs.push('--pr', `${context.payload.number}`);
+  }
+  if (slug) {
+    commitExecArgs.push('--slug', `${slug}`);
+  }
+
+
+  return {commitExecArgs, commitOptions, commitCommand};
+};
+
+const buildGeneralExec = () => {
+  const url = core.getInput('url');
+  const verbose = isTrue(core.getInput('verbose'));
+  const args = [];
+
+  if (url) {
+    args.push('--enterprise-url', `${url}`);
+  }
+  if (verbose) {
+    args.push('-v');
+  }
+  return {args, verbose};
+};
+
+const buildReportExec = () => {
+  const overrideCommit = core.getInput('override_commit');
+  const slug = core.getInput('slug');
+  const token = core.getInput('token');
+
+
+  const reportCommand = 'create-report';
+  const reportExecArgs = [];
+
+  const reportOptions:any = {};
+  reportOptions.env = Object.assign(process.env, {
+    GITHUB_ACTION: process.env.GITHUB_ACTION,
+    GITHUB_RUN_ID: process.env.GITHUB_RUN_ID,
+    GITHUB_REF: process.env.GITHUB_REF,
+    GITHUB_REPOSITORY: process.env.GITHUB_REPOSITORY,
+    GITHUB_SHA: process.env.GITHUB_SHA,
+    GITHUB_HEAD_REF: process.env.GITHUB_HEAD_REF || '',
+  });
+
+
+  if (token) {
+    reportOptions.env.CODECOV_TOKEN = token;
+  }
+  if (overrideCommit) {
+    reportExecArgs.push('-C', `${overrideCommit}`);
+  } else if (
+    `${context.eventName}` == 'pull_request' ||
+    `${context.eventName}` == 'pull_request_target'
+  ) {
+    reportExecArgs.push('-C', `${context.payload.pull_request.head.sha}`);
+  }
+  if (slug) {
+    reportExecArgs.push('--slug', `${slug}`);
+  }
+
+  return {reportExecArgs, reportOptions, reportCommand};
+};
+
+const buildUploadExec = () => {
   const envVars = core.getInput('env_vars');
   const dryRun = isTrue(core.getInput('dry_run'));
   const failCi = isTrue(core.getInput('fail_ci_if_error'));
   const file = core.getInput('file');
   const files = core.getInput('files');
   const flags = core.getInput('flags');
-  const gcov = core.getInput('gcov');
-  const gcovArgs = core.getInput('gcov_args');
-  const gcovIgnore = core.getInput('gcov_ignore');
-  const gcovInclude = core.getInput('gcov_include');
-  const functionalities = core.getInput('functionalities');
   const name = core.getInput('name');
   const os = core.getInput('os');
   const overrideBranch = core.getInput('override_branch');
   const overrideBuild = core.getInput('override_build');
   const overrideCommit = core.getInput('override_commit');
   const overridePr = core.getInput('override_pr');
-  const overrideTag = core.getInput('override_tag');
   const rootDir = core.getInput('root_dir');
   const searchDir = core.getInput('directory');
   const slug = core.getInput('slug');
   const token = core.getInput('token');
   let uploaderVersion = core.getInput('version');
-  const url = core.getInput('url');
-  const verbose = isTrue(core.getInput('verbose'));
   const workingDir = core.getInput('working-directory');
-  const xcode = core.getInput('xcode');
-  const xcodeArchivePath = core.getInput('xcode_archive_path');
+  const plugin = core.getInput('plugin');
+  const exclude = core.getInput('exclude');
 
-  const execArgs = [];
-  execArgs.push(
-      '-n',
-      `${name}`,
-      '-Q',
-      `github-action-${version}`,
-  );
-
-  const options:any = {};
-  options.env = Object.assign(process.env, {
+  const uploadExecArgs = [];
+  const uploadCommand = 'do-upload';
+  const uploadOptions:any = {};
+  uploadOptions.env = Object.assign(process.env, {
     GITHUB_ACTION: process.env.GITHUB_ACTION,
     GITHUB_RUN_ID: process.env.GITHUB_RUN_ID,
     GITHUB_REF: process.env.GITHUB_REF,
@@ -70,117 +164,99 @@ const buildExec = () => {
   for (const envVar of envVars.split(',')) {
     const envVarClean = envVar.trim();
     if (envVarClean) {
-      options.env[envVarClean] = process.env[envVarClean];
+      uploadOptions.env[envVarClean] = process.env[envVarClean];
       envVarsArg.push(envVarClean);
     }
   }
-
+  if (name) {
+    uploadExecArgs.push(
+        '-n',
+        `${name}`,
+    );
+  }
   if (token) {
-    options.env.CODECOV_TOKEN = token;
-  }
-  if (clean) {
-    execArgs.push('-c');
-  }
-  if (commitParent) {
-    execArgs.push('-N', `${commitParent}`);
+    uploadOptions.env.CODECOV_TOKEN = token;
   }
   if (dryRun) {
-    execArgs.push('-d');
+    uploadExecArgs.push('-d');
   }
   if (envVarsArg.length) {
-    execArgs.push('-e', envVarsArg.join(','));
-  }
-  if (functionalities) {
-    functionalities.split(',').map((f) => f.trim()).forEach((f) => {
-      execArgs.push('-X', `${f}`);
-    });
+    uploadExecArgs.push('-e', envVarsArg.join(','));
   }
   if (failCi) {
-    execArgs.push('-Z');
+    uploadExecArgs.push('-Z');
   }
   if (file) {
-    execArgs.push('-f', `${file}`);
+    uploadExecArgs.push('-f', `${file}`);
   }
   if (files) {
     files.split(',').map((f) => f.trim()).forEach((f) => {
-      execArgs.push('-f', `${f}`);
+      uploadExecArgs.push('-f', `${f}`);
     });
   }
   if (flags) {
     flags.split(',').map((f) => f.trim()).forEach((f) => {
-      execArgs.push('-F', `${f}`);
+      uploadExecArgs.push('-F', `${f}`);
     });
   }
-
-  if (gcov) {
-    execArgs.push('-g');
-  }
-  if (gcovArgs) {
-    execArgs.push('--gcovArgs', `${gcovArgs}`);
-  }
-  if (gcovIgnore) {
-    execArgs.push('--gcovIgnore', `${gcovIgnore}`);
-  }
-  if (gcovInclude) {
-    execArgs.push('--gcovInclude', `${gcovInclude}`);
-  }
-
   if (overrideBranch) {
-    execArgs.push('-B', `${overrideBranch}`);
+    uploadExecArgs.push('-B', `${overrideBranch}`);
   }
   if (overrideBuild) {
-    execArgs.push('-b', `${overrideBuild}`);
+    uploadExecArgs.push('-b', `${overrideBuild}`);
   }
   if (overrideCommit) {
-    execArgs.push('-C', `${overrideCommit}`);
+    uploadExecArgs.push('-C', `${overrideCommit}`);
   } else if (
     `${context.eventName}` == 'pull_request' ||
     `${context.eventName}` == 'pull_request_target'
   ) {
-    execArgs.push('-C', `${context.payload.pull_request.head.sha}`);
+    uploadExecArgs.push('-C', `${context.payload.pull_request.head.sha}`);
   }
   if (overridePr) {
-    execArgs.push('-P', `${overridePr}`);
+    uploadExecArgs.push('-P', `${overridePr}`);
   } else if (
     `${context.eventName}` == 'pull_request_target'
   ) {
-    execArgs.push('-P', `${context.payload.number}`);
-  }
-  if (overrideTag) {
-    execArgs.push('-T', `${overrideTag}`);
+    uploadExecArgs.push('-P', `${context.payload.number}`);
   }
   if (rootDir) {
-    execArgs.push('-R', `${rootDir}`);
+    uploadExecArgs.push('--network-root-folder', `${rootDir}`);
   }
   if (searchDir) {
-    execArgs.push('-s', `${searchDir}`);
+    uploadExecArgs.push('-s', `${searchDir}`);
   }
   if (slug) {
-    execArgs.push('-r', `${slug}`);
-  }
-  if (url) {
-    execArgs.push('-u', `${url}`);
-  }
-  if (verbose) {
-    execArgs.push('-v');
+    uploadExecArgs.push('-r', `${slug}`);
   }
   if (workingDir) {
-    options.cwd = workingDir;
+    uploadOptions.cwd = workingDir;
   }
-  if (xcode && xcodeArchivePath) {
-    execArgs.push('--xc');
-    execArgs.push('--xp', `${xcodeArchivePath}`);
+  if (plugin) {
+    uploadExecArgs.push('--plugin', `${plugin}`);
+  }
+  if (exclude) {
+    uploadExecArgs.push('--exclude', `${exclude}`);
   }
 
   if (uploaderVersion == '') {
     uploaderVersion = 'latest';
   }
 
-  if (verbose) {
-    console.debug({execArgs});
-  }
-
-  return {execArgs, options, failCi, os, uploaderVersion, verbose};
+  return {
+    uploadExecArgs,
+    uploadOptions,
+    failCi,
+    os,
+    uploaderVersion,
+    uploadCommand,
+  };
 };
 
-export default buildExec;
+
+export {
+  buildCommitExec,
+  buildGeneralExec,
+  buildReportExec,
+  buildUploadExec,
+};

src/helpers.test.ts

@@ -4,6 +4,7 @@ import {
   isValidPlatform,
   isWindows,
   PLATFORMS,
+  getCommand,
 } from './helpers';
 
 let OLDOS = process.env.RUNNER_OS;
@@ -39,32 +40,35 @@ test('getBaseUrl', () => {
   expect(PLATFORMS.map((platform) => {
     return getBaseUrl(platform, 'latest');
   })).toEqual([
-    'https://uploader.codecov.io/latest/alpine/codecov',
-    'https://uploader.codecov.io/latest/linux/codecov',
-    'https://uploader.codecov.io/latest/macos/codecov',
-    'https://uploader.codecov.io/latest/windows/codecov.exe',
+    'https://cli.codecov.io/latest/linux/codecov',
+    'https://cli.codecov.io/latest/macos/codecov',
+    'https://cli.codecov.io/latest/windows/codecov.exe',
   ]);
 
   expect(PLATFORMS.map((platform) => {
     return getBaseUrl(platform, 'v0.1.0_8880');
   })).toEqual([
-    'https://uploader.codecov.io/v0.1.0_8880/alpine/codecov',
-    'https://uploader.codecov.io/v0.1.0_8880/linux/codecov',
-    'https://uploader.codecov.io/v0.1.0_8880/macos/codecov',
-    'https://uploader.codecov.io/v0.1.0_8880/windows/codecov.exe',
+    'https://cli.codecov.io/v0.1.0_8880/linux/codecov',
+    'https://cli.codecov.io/v0.1.0_8880/macos/codecov',
+    'https://cli.codecov.io/v0.1.0_8880/windows/codecov.exe',
   ]);
 });
 
 test('isWindows', () => {
   expect(PLATFORMS.map((platform) => {
     return isWindows(platform);
-  })).toEqual([false, false, false, true]);
+  })).toEqual([false, false, true]);
 });
 
 test('isValidPlatform', () => {
   expect(PLATFORMS.map((platform) => {
     return isValidPlatform(platform);
-  })).toEqual([true, true, true, true]);
+  })).toEqual([true, true, true]);
 
   expect(isValidPlatform('fakeos')).toBeFalsy();
 });
+
+test('getCommand', () => {
+  expect(getCommand('path', ['-v', '-x'], 'do-upload'))
+      .toEqual(['path', '-v', '-x', 'do-upload']);
+});

src/helpers.ts

@@ -1,6 +1,10 @@
 import * as core from '@actions/core';
 
-const PLATFORMS = ['alpine', 'linux', 'macos', 'windows'];
+const PLATFORMS = [
+  'linux',
+  'macos',
+  'windows',
+];
 
 const setFailure = (message: string, failCi: boolean): void => {
     failCi ? core.setFailed(message) : core.warning(message);
@@ -44,7 +48,17 @@ const getPlatform = (os?: string): string => {
 };
 
 const getBaseUrl = (platform: string, version: string): string => {
-  return `https://uploader.codecov.io/${version}/${platform}/${getUploaderName(platform)}`;
+  return `https://cli.codecov.io/${version}/${platform}/${getUploaderName(platform)}`;
+};
+
+const getCommand = (
+    filename: string,
+    generalArgs:string[],
+    command: string,
+): string[] => {
+  const fullCommand = [filename, ...generalArgs, command];
+  core.info(`==> Running command '${fullCommand.join(' ')}'`);
+  return fullCommand;
 };
 
 export {
@@ -55,4 +69,5 @@ export {
   isValidPlatform,
   isWindows,
   setFailure,
+  getCommand,
 };

src/index.ts

@@ -4,12 +4,18 @@ import * as path from 'path';
 
 import * as exec from '@actions/exec';
 
-import buildExec from './buildExec';
+import {
+  buildCommitExec,
+  buildGeneralExec,
+  buildReportExec,
+  buildUploadExec,
+} from './buildExec';
 import {
   getBaseUrl,
   getPlatform,
   getUploaderName,
   setFailure,
+  getCommand,
 } from './helpers';
 
 import verify from './validate';
@@ -18,7 +24,18 @@ import versionInfo from './version';
 let failCi;
 
 try {
-  const {execArgs, options, failCi, os, uploaderVersion, verbose} = buildExec();
+  const {commitExecArgs, commitOptions, commitCommand} = buildCommitExec();
+  const {reportExecArgs, reportOptions, reportCommand} = buildReportExec();
+  const {
+    uploadExecArgs,
+    uploadOptions,
+    failCi,
+    os,
+    uploaderVersion,
+    uploadCommand,
+  } = buildUploadExec();
+  const {args, verbose} = buildGeneralExec();
+
   const platform = getPlatform(os);
 
   const filename = path.join( __dirname, getUploaderName(platform));
@@ -49,14 +66,52 @@ try {
               }
             });
           };
-          await exec.exec(filename, execArgs, options)
-              .catch((err) => {
+          const doUpload = async () => {
+            await exec.exec(getCommand(filename, args, uploadCommand).join(' '),
+                uploadExecArgs,
+                uploadOptions)
+                .catch((err) => {
+                  setFailure(
+                      `Codecov: 
+                      Failed to properly upload report: ${err.message}`,
+                      failCi,
+                  );
+                });
+          };
+          const createReport = async () => {
+            await exec.exec(
+                getCommand(filename, args, reportCommand).join(' '),
+                reportExecArgs,
+                reportOptions)
+                .then(async (exitCode) => {
+                  if (exitCode == 0) {
+                    await doUpload();
+                  }
+                }).catch((err) => {
+                  setFailure(
+                      `Codecov: 
+                      Failed to properly create report: ${err.message}`,
+                      failCi,
+                  );
+                });
+          };
+          await exec.exec(
+              getCommand(
+                  filename,
+                  args,
+                  commitCommand,
+              ).join(' '),
+              commitExecArgs, commitOptions)
+              .then(async (exitCode) => {
+                if (exitCode == 0) {
+                  await createReport();
+                }
+                unlink();
+              }).catch((err) => {
                 setFailure(
-                    `Codecov: Failed to properly upload: ${err.message}`,
+                    `Codecov: Failed to properly create commit: ${err.message}`,
                     failCi,
                 );
-              }).then(() => {
-                unlink();
               });
         });
   });