Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: CLI option names for uploader #969

Merged
merged 1 commit into from
May 9, 2023
Merged

fix: CLI option names for uploader #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22176,7 +22176,7 @@ const buildExec = () => {
});
}
if (fullReport) {
execArgs.push('-full', `${fullReport}`);
execArgs.push('--full', `${fullReport}`);
}
if (flags) {
flags.split(',').map((f) => f.trim()).forEach((f) => {
Expand All @@ -22187,22 +22187,22 @@ 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('-gcovExecutable', `${gcovExecutable}`);
execArgs.push('--gx', `${gcovExecutable}`);
}
if (networkFilter) {
execArgs.push('-networkFilter', `${networkFilter}`);
execArgs.push('-i', `${networkFilter}`);
}
if (networkPrefix) {
execArgs.push('-networkPrefix', `${networkPrefix}`);
execArgs.push('-k', `${networkPrefix}`);
}
if (overrideBranch) {
execArgs.push('-B', `${overrideBranch}`);
Expand Down Expand Up @@ -22236,10 +22236,10 @@ const buildExec = () => {
execArgs.push('-r', `${slug}`);
}
if (swift) {
execArgs.push('-xs');
execArgs.push('--xs');
}
if (swift && swiftProject) {
execArgs.push('-xsp', `${swiftProject}`);
execArgs.push('--xsp', `${swiftProject}`);
}
if (upstream) {
execArgs.push('-U', `${upstream}`);
Expand All @@ -22251,8 +22251,8 @@ const buildExec = () => {
execArgs.push('-v');
}
if (xcode && xcodeArchivePath) {
execArgs.push('-xc');
execArgs.push('-xp', `${xcodeArchivePath}`);
execArgs.push('--xc');
execArgs.push('--xp', `${xcodeArchivePath}`);
}
if (uploaderVersion == '') {
uploaderVersion = 'latest';
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 14 additions & 15 deletions src/buildExec.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ 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',
Expand All @@ -60,7 +59,7 @@ test('all arguments', () => {
'verbose': 't',
'xcode': 'true',
'xcode_archive_path': '/test.xcresult',
'xtra_args': '-some -other -args',
'xtra_args': '--some --other --args',
};

for (const env of Object.keys(envs)) {
Expand Down Expand Up @@ -88,24 +87,24 @@ test('all arguments', () => {
'dir1/coverage.xml',
'-f',
'dir2/coverage.xml',
'-full',
'--full',
'oldDir/oldReport.json',
'-F',
'test',
'-F',
'test2',
'-g',
'-gcovArgs',
'--ga',
'-v',
'-gcovIgnore',
'--gi',
'*.fake',
'-gcovInclude',
'--gI',
'real_file',
'-gcovExecutable',
'--gx',
'gcov2',
'-networkFilter',
'-i',
'src/',
'-networkPrefix',
'-k',
'build/',
'-B',
'thomasrockhu/test',
Expand All @@ -123,18 +122,18 @@ test('all arguments', () => {
'coverage/',
'-r',
'fakeOwner/fakeRepo',
'-xs',
'-xsp',
'--xs',
'--xsp',
'MyApp',
'-U',
'https://codecov.example.com',
'-u',
'https://codecov.enterprise.com',
'-v',
'-xc',
'-xp',
'--xc',
'--xp',
'/test.xcresult',
'-some -other -args',
'--some --other --args',
]);
expect(failCi).toBeTruthy();

Expand Down
22 changes: 11 additions & 11 deletions src/buildExec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ const buildExec = () => {
});
}
if (fullReport) {
execArgs.push('-full', `${fullReport}`);
execArgs.push('--full', `${fullReport}`);
}
if (flags) {
flags.split(',').map((f) => f.trim()).forEach((f) => {
Expand All @@ -127,23 +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('-gcovExecutable', `${gcovExecutable}`);
execArgs.push('--gx', `${gcovExecutable}`);
}

if (networkFilter) {
execArgs.push('-networkFilter', `${networkFilter}`);
execArgs.push('-i', `${networkFilter}`);
}
if (networkPrefix) {
execArgs.push('-networkPrefix', `${networkPrefix}`);
execArgs.push('-k', `${networkPrefix}`);
}

if (overrideBranch) {
Expand Down Expand Up @@ -180,10 +180,10 @@ const buildExec = () => {
execArgs.push('-r', `${slug}`);
}
if (swift) {
execArgs.push('-xs');
execArgs.push('--xs');
}
if (swift && swiftProject) {
execArgs.push('-xsp', `${swiftProject}`);
execArgs.push('--xsp', `${swiftProject}`);
}
if (upstream) {
execArgs.push('-U', `${upstream}`);
Expand All @@ -195,8 +195,8 @@ const buildExec = () => {
execArgs.push('-v');
}
if (xcode && xcodeArchivePath) {
execArgs.push('-xc');
execArgs.push('-xp', `${xcodeArchivePath}`);
execArgs.push('--xc');
execArgs.push('--xp', `${xcodeArchivePath}`);
}

if (uploaderVersion == '') {
Expand Down