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

src/buildExec.test.ts

@@ -39,27 +39,33 @@ test('all arguments', () => {
     'file': 'coverage.xml',
     'files': 'dir1/coverage.xml,dir2/coverage.xml',
     'flags': 'test,test2',
-    'functionalities':
-      'network',
+    'functionalities': 'network',
+    'full_report': 'oldDir/oldReport.json',
     'gcov': 'true',
     'gcov_args': '-v',
     'gcov_ignore': '*.fake',
     'gcov_include': 'real_file',
+    'gcov_executable': 'gcov2',
     'move_coverage_to_trash': 'true',
     'name': 'codecov',
+    'network_filter': 'src/',
+    'network_prefix': 'build/',
     'override_branch': 'thomasrockhu/test',
     'override_build': '1',
     'override_commit': '9caabca5474b49de74ef5667deabaf74cdacc244',
     'override_pr': '2',
     'override_tag': 'v1.2',
     'root_dir': 'root/',
+    'swift': 'true',
+    'swift_project': 'MyApp',
     'slug': 'fakeOwner/fakeRepo',
     'token': 'd3859757-ab80-4664-924d-aef22fa7557b',
+    'upstream_proxy': 'https://codecov.example.com',
     'url': 'https://codecov.enterprise.com',
     'verbose': 't',
-    'working-directory': 'src',
     'xcode': 'true',
     'xcode_archive_path': '/test.xcresult',
+    'xtra_args': '--some --other --args',
   };
 
   for (const env of Object.keys(envs)) {
@@ -87,17 +93,25 @@ test('all arguments', () => {
     'dir1/coverage.xml',
     '-f',
     'dir2/coverage.xml',
+    '--full',
+    'oldDir/oldReport.json',
     '-F',
     'test',
     '-F',
     'test2',
     '-g',
-    '--gcovArgs',
+    '--ga',
     '-v',
-    '--gcovIgnore',
+    '--gi',
     '*.fake',
-    '--gcovInclude',
+    '--gI',
     'real_file',
+    '--gx',
+    'gcov2',
+    '-i',
+    'src/',
+    '-k',
+    'build/',
     '-B',
     'thomasrockhu/test',
     '-b',
@@ -114,12 +128,18 @@ test('all arguments', () => {
     'coverage/',
     '-r',
     'fakeOwner/fakeRepo',
+    '--xs',
+    '--xsp',
+    'MyApp',
+    '-U',
+    'https://codecov.example.com',
     '-u',
     'https://codecov.enterprise.com',
     '-v',
     '--xc',
     '--xp',
     '/test.xcresult',
+    '--some --other --args',
   ]);
   expect(failCi).toBeTruthy();
 

src/buildExec.ts

@@ -19,18 +19,22 @@ const isTrue = (variable) => {
 const buildExec = () => {
   const clean = core.getInput('move_coverage_to_trash');
   const commitParent = core.getInput('commit_parent');
-  const envVars = core.getInput('env_vars');
   const dryRun = isTrue(core.getInput('dry_run'));
+  const envVars = core.getInput('env_vars');
   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 fullReport = core.getInput('full_report');
+  const functionalities = core.getInput('functionalities');
   const gcov = core.getInput('gcov');
   const gcovArgs = core.getInput('gcov_args');
+  const gcovExecutable = core.getInput('gcov_executable');
   const gcovIgnore = core.getInput('gcov_ignore');
   const gcovInclude = core.getInput('gcov_include');
-  const functionalities = core.getInput('functionalities');
   const name = core.getInput('name');
+  const networkFilter = core.getInput('network_filter');
+  const networkPrefix = core.getInput('network_prefix');
   const os = core.getInput('os');
   const overrideBranch = core.getInput('override_branch');
   const overrideBuild = core.getInput('override_build');
@@ -40,13 +44,17 @@ const buildExec = () => {
   const rootDir = core.getInput('root_dir');
   const searchDir = core.getInput('directory');
   const slug = core.getInput('slug');
+  const swift = core.getInput('swift');
+  const swiftProject = core.getInput('swift_project');
   const token = core.getInput('token');
-  let uploaderVersion = core.getInput('version');
+  const upstream = core.getInput('upstream_proxy');
   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 xtraArgs = core.getInput('xtra_args');
+  let uploaderVersion = core.getInput('version');
 
   const execArgs = [];
   execArgs.push(
@@ -106,6 +114,9 @@ const buildExec = () => {
       execArgs.push('-f', `${f}`);
     });
   }
+  if (fullReport) {
+    execArgs.push('--full', `${fullReport}`);
+  }
   if (flags) {
     flags.split(',').map((f) => f.trim()).forEach((f) => {
       execArgs.push('-F', `${f}`);
@@ -116,13 +127,23 @@ const buildExec = () => {
     execArgs.push('-g');
   }
   if (gcovArgs) {
-    execArgs.push('--gcovArgs', `${gcovArgs}`);
+    execArgs.push('--ga', `${gcovArgs}`);
   }
   if (gcovIgnore) {
-    execArgs.push('--gcovIgnore', `${gcovIgnore}`);
+    execArgs.push('--gi', `${gcovIgnore}`);
   }
   if (gcovInclude) {
-    execArgs.push('--gcovInclude', `${gcovInclude}`);
+    execArgs.push('--gI', `${gcovInclude}`);
+  }
+  if (gcovExecutable) {
+    execArgs.push('--gx', `${gcovExecutable}`);
+  }
+
+  if (networkFilter) {
+    execArgs.push('-i', `${networkFilter}`);
+  }
+  if (networkPrefix) {
+    execArgs.push('-k', `${networkPrefix}`);
   }
 
   if (overrideBranch) {
@@ -158,15 +179,21 @@ const buildExec = () => {
   if (slug) {
     execArgs.push('-r', `${slug}`);
   }
+  if (swift) {
+    execArgs.push('--xs');
+  }
+  if (swift && swiftProject) {
+    execArgs.push('--xsp', `${swiftProject}`);
+  }
+  if (upstream) {
+    execArgs.push('-U', `${upstream}`);
+  }
   if (url) {
     execArgs.push('-u', `${url}`);
   }
   if (verbose) {
     execArgs.push('-v');
   }
-  if (workingDir) {
-    options.cwd = workingDir;
-  }
   if (xcode && xcodeArchivePath) {
     execArgs.push('--xc');
     execArgs.push('--xp', `${xcodeArchivePath}`);
@@ -180,6 +207,14 @@ const buildExec = () => {
     console.debug({execArgs});
   }
 
+  if (workingDir) {
+    options.cwd = workingDir;
+  }
+
+  if (xtraArgs) {
+    execArgs.push(`${xtraArgs}`);
+  }
+
   return {execArgs, options, failCi, os, uploaderVersion, verbose};
 };
 

src/helpers.test.ts

@@ -39,6 +39,7 @@ test('getBaseUrl', () => {
   expect(PLATFORMS.map((platform) => {
     return getBaseUrl(platform, 'latest');
   })).toEqual([
+    'https://uploader.codecov.io/latest/aarch64/codecov',
     'https://uploader.codecov.io/latest/alpine/codecov',
     'https://uploader.codecov.io/latest/linux/codecov',
     'https://uploader.codecov.io/latest/macos/codecov',
@@ -48,6 +49,7 @@ test('getBaseUrl', () => {
   expect(PLATFORMS.map((platform) => {
     return getBaseUrl(platform, 'v0.1.0_8880');
   })).toEqual([
+    'https://uploader.codecov.io/v0.1.0_8880/aarch64/codecov',
     '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',
@@ -58,13 +60,13 @@ test('getBaseUrl', () => {
 test('isWindows', () => {
   expect(PLATFORMS.map((platform) => {
     return isWindows(platform);
-  })).toEqual([false, false, false, true]);
+  })).toEqual([false, false, false, false, true]);
 });
 
 test('isValidPlatform', () => {
   expect(PLATFORMS.map((platform) => {
     return isValidPlatform(platform);
-  })).toEqual([true, true, true, true]);
+  })).toEqual([true, true, true, true, true]);
 
   expect(isValidPlatform('fakeos')).toBeFalsy();
 });

src/helpers.ts

@@ -1,6 +1,12 @@
 import * as core from '@actions/core';
 
-const PLATFORMS = ['alpine', 'linux', 'macos', 'windows'];
+const PLATFORMS = [
+  'aarch64',
+  'alpine',
+  'linux',
+  'macos',
+  'windows',
+];
 
 const setFailure = (message: string, failCi: boolean): void => {
     failCi ? core.setFailed(message) : core.warning(message);