Merge pull request #342 from codecov/1.5.2

fix: Import version properly as string not object

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

.github/workflows/main.yml

@@ -6,8 +6,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-        with:
-          fetch-depth: 2
       - name: Install dependencies
         run: npm install
       - name: Lint

CHANGELOG.md

@@ -1,27 +1,98 @@
-### 1.2.0
+## 1.5.2
+### Fixes
+- # fix: Import version properly as string not object
 
-#### Features
+## 1.5.1
+### Fixes
+- #320 doc: add github actions badge
+- #336 Update bash uploader to 1.0.3
+- #339 fix: Add action version
+
+### Dependencies
+- #302 Bump @typescript-eslint/eslint-plugin from 4.22.0 to 4.22.1
+- #303 Bump @typescript-eslint/parser from 4.22.0 to 4.22.1
+- #304 Bump ts-jest from 26.5.5 to 26.5.6
+- #309 Bump lodash from 4.17.19 to 4.17.21
+- #310 Bump hosted-git-info from 2.8.8 to 2.8.9
+- #311 Bump @actions/github from 4.0.0 to 5.0.0
+- #314 Bump eslint from 7.25.0 to 7.27.0
+- #315 Bump @actions/core from 1.2.7 to 1.3.0
+- #316 Bump @typescript-eslint/parser from 4.22.1 to 4.25.0
+- #317 Bump @typescript-eslint/eslint-plugin from 4.22.1 to 4.25.0
+- #319 Bump jest-junit from 12.0.0 to 12.1.0
+- #321 Bump typescript from 4.2.4 to 4.3.2
+- #323 Bump ws from 7.3.1 to 7.4.6
+- #331 Bump eslint from 7.27.0 to 7.28.0
+- #332 Bump @actions/exec from 1.0.4 to 1.1.0
+- #333 Bump @typescript-eslint/parser from 4.25.0 to 4.26.1
+- #334 Bump @typescript-eslint/eslint-plugin from 4.25.0 to 4.26.1
+- #335 Bump @actions/core from 1.3.0 to 1.4.0
+- #337 Bump glob-parent from 5.1.1 to 5.1.2
+
+## 1.5.0
+### Features
+- #299 Pull Codecov bash script into the action
+
+### Dependencies
+- #271 Bump typescript from 4.2.3 to 4.2.4
+- #277 Bump @typescript-eslint/eslint-plugin from 4.16.1 to 4.22.0
+- #278 Bump @typescript-eslint/parser from 4.20.0 to 4.22.0
+- #279 Bump @actions/core from 1.2.6 to 1.2.7
+- #292 Bump ts-jest from 26.5.3 to 26.5.5
+- #293 Bump eslint from 7.21.0 to 7.25.0
+- #297 Bump @types/jest from 26.0.20 to 26.0.23
+- #298 Upgrade to GitHub-native Dependabot
+
+## 1.4.1
+### Fixes
+- #287 Update VERSION regex to restrict on digits and dot and move checksums into script
+
+## 1.4.0
+### Features
+- #282 Add checksum verification of bash script
+
+## 1.3.2
+### Fixes
+- #264 Overwrites pr number for pull_request_target events
+
+## 1.3.1
+### Fixes
+- #253 Add `network_filter` to action manifest
+
+## 1.3.0
+### Features
+- #252 Add "network_filter" input
+
+## 1.2.2
+### Fixes
+- #241 pass root_dir using proper bash arg
+- #244 Overwrite the commit on pull_request* events
+
+## 1.2.1
+### Fixes
+- #196 Add parameters to the action.yml
+
+## 1.2.0
+### Features
 - #193 Add all the bash params
 
-#### Fixes
+### Fixes
 - #193 Fixes issue with working-directory
 
-### 1.1.1
-
-#### Fixes
+## 1.1.1
+### Fixes
 - #184 Add automations ensure proper builds and deployments
 - #184 Fixes verbose flag
 
-### 1.1.0
-
-#### Features
+## 1.1.0
+### Features
 - #110 Add "working-directory:" input
 - #174 Support Xcode specificed parameters
 
-#### Fixes
+### Fixes
 - #172 File is saved as text
 
-#### Dependencies and Misc
+### Dependencies and Misc
 - #166 Bump requestretry from 4.1.1 to 4.1.2
 - #169 Bump typescript from 4.0.5 to 4.1.2
 - #178 Bump @types/jest from 26.0.15 to 26.0.19

README.md

@@ -2,6 +2,7 @@
 
 [![GitHub Marketplace](https://img.shields.io/badge/Marketplace-v1-undefined.svg?logo=github&logoColor=white&style=flat)](https://github.com/marketplace/actions/codecov)
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fcodecov%2Fcodecov-action.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fcodecov%2Fcodecov-action?ref=badge_shield)
+[![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!
@@ -54,7 +55,7 @@ Codecov's Action currently supports five inputs from the user: `token`, `file`,
 | | `recursesubs` Enable recurse submodules in git projects when searching for source files | |
 | | `search` Disable searching for reports |
 | | `xcode` Disable xcode processing |
-| `gcov path_include` | Paths to include during gcov gathering (as a glob) | Optional
+| `gcov_path_include` | Paths to include during gcov gathering (as a glob) | Optional
 | `gcov_args` | extra arguments to pass to gcov | Optional
 | `gcov_executable` | gcov executable to run. Defaults to 'gcov' | Optional
 | `gcov_path_exclude` | Paths to ignore during gcov gathering (as a glob) | Optional

action.yml

@@ -2,15 +2,9 @@ name: 'Codecov'
 description: 'GitHub Action that uploads coverage reports for your repository to codecov.io'
 author: 'Ibrahim Ali <@ibrahim0814> & Thomas Hu <@thomasrockhu> | Codecov'
 inputs:
-  name:
-    description: 'User defined upload name. Visible in Codecov UI'
-    required: false
   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
@@ -20,8 +14,14 @@ inputs:
   flags:
     description: 'Flag upload to group coverage metrics (e.g. unittests | integration | ui,chrome)'
     required: false
-  path_to_write_report:
-    description: 'Write upload file to path before uploading'
+  aws_curl_args:
+    description: 'Extra curl arguments to communicate with AWS.'
+    required: false
+  codecov_curl_args:
+    description: 'Extra curl arguments to communicate with Codecov. e.g., -U "--proxy http://http-proxy"'
+    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
   env_vars:
     description: 'Environment variables to tag the upload with (e.g. PYTHON | OS,PYTHON)'
@@ -29,12 +29,72 @@ 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_args:
+    description: 'extra arguments to pass to gcov'
+    required: false
+  gcov_executable:
+    description: 'gcov executable to run. Defaults to gcov'
+    required: false
+  gcov_path_exclude:
+    description: 'Paths to ignore during gcov gathering (as a glob)'
+    required: false
+  gcov_path_include:
+    description: 'Paths to include during gcov gathering (as a glob)'
+    required: false
+  gcov_prefix:
+    description: 'Prefix filepaths to help resolve path fixing'
+    required: false
+  gcov_root_dir:
+    description: 'Project root directory, also used when preparing gcov'
+    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
+  network_filter:
+    description: 'Used to restrict the set of git/hg files that can be matched with filenames in the coverage report. This is useful for monorepos or other setups where a full filepath may not be specified in the coverage report, and that shortened filepath may appear multiple times in a directory structure (e.g. __init__.py)'
+    required: false
+  override_branch:
+    description: 'Specify the branch name'
+    required: false
+  override_build:
+    description: 'Specify the build number'
+    required: false
+  override_commit:
+    description: 'Specify the commit SHA'
+    required: false
+  override_pr:
+    description: 'Specify the pull request number'
+    required: false
+  override_tag:
+    description: 'Specify the git tag'
+    required: false
+  path_to_write_report:
+    description: 'Write upload file to path before uploading'
+    required: false
+  root_dir:
+    description: 'Used when not in git/hg project to identify project root directory'
+    required: false
   verbose:
     description: 'Specify whether the Codecov output should be verbose'
     required: false
   working-directory:
     description: 'Directory in which to execute codecov.sh'
     required: false
+  xcode_derived_data:
+    description: 'Custom Derived Data Path for Coverage.profdata and gcov processing'
+    required: false
+  xcode_package:
+    description: 'Specify packages to build coverage. Uploader will only build these packages'
+    required: false
 branding:
   color: 'red'
   icon: 'umbrella'

hooks/pre-commit

@@ -4,5 +4,5 @@ npm i --package-lock-only
 npm run lint --fix
 npm run build
 git add src/
-git add dist/index.js
+git add dist/
 git add package-lock.json

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codecov-action",
-  "version": "1.2.0",
+  "version": "1.5.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.2.6",
-    "@actions/exec": "^1.0.4",
-    "@types/jest": "^26.0.19",
+    "@actions/core": "^1.4.0",
+    "@actions/exec": "^1.1.0",
+    "@actions/github": "^5.0.0",
+    "@types/jest": "^26.0.23",
     "@zeit/ncc": "^0.22.3",
     "fs": "0.0.1-security",
     "jest": "^26.6.3",
-    "jest-junit": "^12.0.0",
+    "jest-junit": "^12.1.0",
     "request": "^2.88.2",
-    "requestretry": "^4.1.2",
-    "ts-jest": "^26.4.4",
-    "typescript": "^4.1.3",
+    "ts-jest": "^26.5.6",
+    "typescript": "^4.3.2",
     "yarn": "^1.22.10"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^4.11.1",
-    "@typescript-eslint/parser": "^4.11.1",
-    "eslint": "^7.17.0",
+    "@typescript-eslint/eslint-plugin": "^4.26.1",
+    "@typescript-eslint/parser": "^4.26.1",
+    "eslint": "^7.28.0",
     "eslint-config-google": "^0.14.0"
   }
 }

src/buildExec.test.ts

@@ -1,16 +1,26 @@
 import buildExec from './buildExec';
+const github = require('@actions/github');
+
+import VERSION from './version';
+
+const context = github.context;
 
 test('no arguments', () => {
   const {execArgs, filepath, failCi} = buildExec();
-  expect(execArgs).toEqual([
+
+  const args = [
     'codecov.sh',
     '-n',
     '',
     '-F',
     '',
     '-Q',
-    'github-action',
-  ]);
+    `github-action-${VERSION}`,
+  ];
+  if (context.eventName == 'pull_request') {
+    args.push('-C', `${context.payload.pull_request.head.sha}`);
+  }
+  expect(execArgs).toEqual(args);
   expect(filepath).toEqual('codecov.sh');
   expect(failCi).toBeFalsy();
 });
@@ -35,6 +45,7 @@ test('all arguments', () => {
     'gcov_path_include': '**/include-dir/*.*',
     'gcov_prefix': 'demo',
     'name': 'codecov',
+    'network_filter': 'dir1',
     'override_branch': 'thomasrockhu/test',
     'override_build': '1',
     'override_commit': '9caabca5474b49de74ef5667deabaf74cdacc244',
@@ -62,7 +73,7 @@ test('all arguments', () => {
     '-F',
     'test',
     '-Q',
-    'github-action',
+    `github-action-${VERSION}`,
     '-c',
     '-N',
     '83231650328f11695dfb754ca0f540516f188d27',
@@ -107,6 +118,8 @@ test('all arguments', () => {
     '**/include-dir/*.*',
     '-k',
     'demo',
+    '-i',
+    'dir1',
     '-B',
     'thomasrockhu/test',
     '-b',
@@ -117,7 +130,7 @@ test('all arguments', () => {
     '2',
     '-T',
     'v1.2',
-    '-N',
+    '-R',
     'root/',
     '-s',
     'coverage/',

src/buildExec.ts

@@ -1,4 +1,9 @@
 const core = require('@actions/core');
+const github = require('@actions/github');
+
+import VERSION from './version';
+
+const context = github.context;
 
 const isTrue = (variable) => {
   const lowercase = variable.toLowerCase();
@@ -29,6 +34,7 @@ const buildExec = () => {
   const gcovInclude = core.getInput('gcov_path_include');
   const gcovPrefix = core.getInput('gcov_prefix');
   const name = core.getInput('name');
+  const networkFilter = core.getInput('network_filter');
   const overrideBranch = core.getInput('override_branch');
   const overrideBuild = core.getInput('override_build');
   const overrideCommit = core.getInput('override_commit');
@@ -47,7 +53,14 @@ const buildExec = () => {
     workingDir + '/codecov.sh' : 'codecov.sh';
 
   const execArgs = [filepath];
-  execArgs.push( '-n', `${name}`, '-F', `${flags}`, '-Q', 'github-action' );
+  execArgs.push(
+      '-n',
+      `${name}`,
+      '-F',
+      `${flags}`,
+      '-Q',
+      `github-action-${VERSION}`,
+  );
 
   const options:any = {};
   options.env = Object.assign(process.env, {
@@ -120,6 +133,9 @@ const buildExec = () => {
   if (gcovPrefix) {
     execArgs.push('-k', `${gcovPrefix}`);
   }
+  if (networkFilter) {
+    execArgs.push('-i', `${networkFilter}`);
+  }
   if (overrideBranch) {
     execArgs.push('-B', `${overrideBranch}`);
   }
@@ -128,15 +144,24 @@ const buildExec = () => {
   }
   if (overrideCommit) {
     execArgs.push('-C', `${overrideCommit}`);
+  } else if (
+    `${context.eventName}` == 'pull_request' ||
+    `${context.eventName}` == 'pull_request_target'
+  ) {
+    execArgs.push('-C', `${context.payload.pull_request.head.sha}`);
   }
   if (overridePr) {
     execArgs.push('-P', `${overridePr}`);
+  } else if (
+    `${context.eventName}` == 'pull_request_target'
+  ) {
+    execArgs.push('-P', `${context.payload.number}`);
   }
   if (overrideTag) {
     execArgs.push('-T', `${overrideTag}`);
   }
   if (rootDir) {
-    execArgs.push('-N', `${rootDir}`);
+    execArgs.push('-R', `${rootDir}`);
   }
   if (searchDir) {
     execArgs.push('-s', `${searchDir}`);

src/index.ts

@@ -1,28 +1,17 @@
 const core = require('@actions/core');
 const exec = require('@actions/exec');
+
 const fs = require('fs');
-const request = require('requestretry');
 
 import buildExec from './buildExec';
 
+const codecovScript = fs.readFileSync(__dirname + '/codecov');
+
 let failCi;
 try {
-  request({
-    json: false,
-    maxAttempts: 10,
-    timeout: 3000,
-    url: 'https://codecov.io/bash',
-  }, (error, response, body) => {
   const {execArgs, options, filepath, failCi} = buildExec();
 
-    try {
-      if (error && failCi) {
-        throw error;
-      } else if (error) {
-        core.warning(`Codecov warning: ${error.message}`);
-      }
-
-      fs.writeFile(filepath, body, (err) => {
+  fs.writeFile(filepath, codecovScript, (err) => {
     if (err && failCi) {
       throw err;
     } else if (err) {
@@ -53,12 +42,6 @@ try {
       });
     };
   });
-    } catch (error) {
-      core.setFailed(
-          `Codecov failed with the following error: ${error.message}`,
-      );
-    }
-  });
 } catch (error) {
   if (failCi) {
     core.setFailed(`Codecov failed with the following error: ${error.message}`);

src/version.ts

@@ -0,0 +1,3 @@
+const VERSION = 'v1.5.2';
+
+export default VERSION;