From b7c9e4ea105d45e9984f597da7615eb8e477936d Mon Sep 17 00:00:00 2001 From: Joe Becher Date: Tue, 19 May 2020 09:48:08 -0400 Subject: [PATCH 01/15] Switch from execSync to execFileSync --- .idea/.gitignore | 7 +++++++ lib/codecov.js | 15 ++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 .idea/.gitignore diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..03edeb0b --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,7 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ + +.idea/ \ No newline at end of file diff --git a/lib/codecov.js b/lib/codecov.js index 2a8cc448..f314f247 100644 --- a/lib/codecov.js +++ b/lib/codecov.js @@ -4,6 +4,7 @@ var request = require('teeny-request').teenyRequest var urlgrey = require('urlgrey') var jsYaml = require('js-yaml') var walk = require('ignore-walk') +var execFileSync = require('child_process').execFileSync var execSync = require('child_process').execSync var detectProvider = require('./detect') @@ -355,7 +356,7 @@ var upload = function(args, on_success, on_failure) { console.log('==> Building file structure') try { upload += - execSync('git ls-files || hg locate', { cwd: root }) + execFileSync('git', ['ls-files', '||', 'hg', 'locate'], { cwd: root }) .toString() .trim() + '\n<<<<<< network\n' } catch (err) { @@ -414,7 +415,7 @@ var upload = function(args, on_success, on_failure) { } debug.push(gcov) console.log(' $ ' + gcov) - execSync(gcov) + execFileSync(gcov) } catch (e) { console.log(' Failed to run gcov command.') } @@ -431,7 +432,9 @@ var upload = function(args, on_success, on_failure) { .toString() .trim() } else { - bowerrc = execSync('if exist .bowerrc type .bowerrc', { cwd: root }) + bowerrc = execFileSync('if', ['exist', '.bowerrc', 'type', '.bowerrc'], { + cwd: root, + }) .toString() .trim() } @@ -475,14 +478,16 @@ var upload = function(args, on_success, on_failure) { console.log('==> Scanning for reports') var _files if (!isWindows) { - _files = execSync('find ' + root + ' ' + patterns + more_patterns) + // @TODO support for a root directory + // It's not straightforward due to the nature of the find command + _files = execFileSync('find', [root, patterns, more_patterns]) .toString() .trim() .split('\n') } else { // @TODO support for a root directory // It's not straightforward due to the nature of the dir command - _files = execSync('dir ' + patterns + more_patterns) + _files = execFileSync('dir', [patterns, more_patterns]) .toString() .trim() .split('\r\n') From 00f0a96b2bdb5749ebc99d082b1fc6ba594b9e7e Mon Sep 17 00:00:00 2001 From: Joe Becher Date: Tue, 30 Jun 2020 10:52:21 -0400 Subject: [PATCH 02/15] Call existsSync instead of executing `if` --- lib/codecov.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/codecov.js b/lib/codecov.js index f314f247..32b624c7 100644 --- a/lib/codecov.js +++ b/lib/codecov.js @@ -432,11 +432,7 @@ var upload = function(args, on_success, on_failure) { .toString() .trim() } else { - bowerrc = execFileSync('if', ['exist', '.bowerrc', 'type', '.bowerrc'], { - cwd: root, - }) - .toString() - .trim() + bowerrc = fs.existsSync('.bowerrc') } if (bowerrc) { bowerrc = JSON.parse(bowerrc).directory From 43904fce512b3e0a53e67e4f75dfdd0bbd7b190a Mon Sep 17 00:00:00 2001 From: Joe Becher Date: Fri, 10 Jul 2020 09:17:24 -0400 Subject: [PATCH 03/15] Trigger a build --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 125e9bfe..2f6d4f30 100644 --- a/README.md +++ b/README.md @@ -111,3 +111,5 @@ nyc report --reporter=text-lcov > coverage.lcov - v3.6.3 Fix for AWS Codebuild & package updates - v3.6.4 Fix Cirrus CI - v3.7.0 Remove the X-Amz-Acl: public-read header + +. From a4cc565ffa06a197c0095c403b86df499fee4965 Mon Sep 17 00:00:00 2001 From: Joe Becher Date: Thu, 16 Jul 2020 09:58:09 -0400 Subject: [PATCH 04/15] I think this fixes linux and macos... --- lib/codecov.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/codecov.js b/lib/codecov.js index 32b624c7..5d638d67 100644 --- a/lib/codecov.js +++ b/lib/codecov.js @@ -18,8 +18,8 @@ var isWindows = process.platform.match(/win32/) || process.platform.match(/win64/) if (!isWindows) { - patterns = - "-type f \\( -name '*coverage.*' " + + patterns = ( + "-type f -name '*coverage.*' " + "-or -name 'nosetests.xml' " + "-or -name 'jacoco*.xml' " + "-or -name 'clover.xml' " + @@ -30,7 +30,7 @@ if (!isWindows) { "-or -name '*.lcov' " + "-or -name 'gcov.info' " + "-or -name '*.gcov' " + - "-or -name '*.lst' \\) " + + "-or -name '*.lst' " + "-not -name '*.sh' " + "-not -name '*.data' " + "-not -name '*.py' " + @@ -77,6 +77,7 @@ if (!isWindows) { "-not -path '*/$bower_components/*' " + "-not -path '*/node_modules/*' " + "-not -path '*/conftest_*.c.gcov'" + ).split(' ') } else { patterns = '/a-d /b /s *coverage.* ' + @@ -473,10 +474,13 @@ var upload = function(args, on_success, on_failure) { } else if ((args.options.disable || '').split(',').indexOf('search') === -1) { console.log('==> Scanning for reports') var _files + var _findArgs if (!isWindows) { // @TODO support for a root directory // It's not straightforward due to the nature of the find command - _files = execFileSync('find', [root, patterns, more_patterns]) + // _files = execFileSync('find', [root, patterns, more_patterns]) + _findArgs = [root].concat(patterns) + _files = execFileSync('find', _findArgs) .toString() .trim() .split('\n') From 2956ed437d75a83f096385bf405671114764365a Mon Sep 17 00:00:00 2001 From: Joe Becher Date: Thu, 16 Jul 2020 10:59:50 -0400 Subject: [PATCH 05/15] Only add more_patterns of it has a value. Correct windows. --- lib/codecov.js | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/lib/codecov.js b/lib/codecov.js index 5d638d67..691c6144 100644 --- a/lib/codecov.js +++ b/lib/codecov.js @@ -79,7 +79,7 @@ if (!isWindows) { "-not -path '*/conftest_*.c.gcov'" ).split(' ') } else { - patterns = + patterns = ( '/a-d /b /s *coverage.* ' + '/s nosetests.xml ' + '/s jacoco*.xml ' + @@ -138,6 +138,7 @@ if (!isWindows) { '| findstr /i /v \\\\$bower_components\\ ' + '| findstr /i /v \\node_modules\\ ' + '| findstr /i /v \\conftest_.*\\.c\\.gcov ' + ).split(' ') } var sendToCodecovV2 = function( @@ -439,11 +440,17 @@ var upload = function(args, on_success, on_failure) { bowerrc = JSON.parse(bowerrc).directory if (bowerrc) { if (!isWindows) { - more_patterns = - " -not -path '*/" + bowerrc.toString().replace(/\/$/, '') + "/*'" + more_patterns = ( + " -not -path '*/" + + bowerrc.toString().replace(/\/$/, '') + + "/*'" + ).split(' ') } else { - more_patterns = - '| findstr /i /v \\' + bowerrc.toString().replace(/\/$/, '') + '\\' + more_patterns = ( + '| findstr /i /v \\' + + bowerrc.toString().replace(/\/$/, '') + + '\\' + ).split(' ') } } } @@ -478,8 +485,10 @@ var upload = function(args, on_success, on_failure) { if (!isWindows) { // @TODO support for a root directory // It's not straightforward due to the nature of the find command - // _files = execFileSync('find', [root, patterns, more_patterns]) _findArgs = [root].concat(patterns) + if (more_patterns.length > 0) { + _findArgs.concat(more_patterns) + } _files = execFileSync('find', _findArgs) .toString() .trim() @@ -487,7 +496,11 @@ var upload = function(args, on_success, on_failure) { } else { // @TODO support for a root directory // It's not straightforward due to the nature of the dir command - _files = execFileSync('dir', [patterns, more_patterns]) + _findArgs = [root].concat(patterns) + if (more_patterns.length > 0) { + _findArgs.concat(more_patterns) + } + _files = execFileSync('dir', _findArgs) .toString() .trim() .split('\r\n') From 27792cc317e3d7c63e8a7e7386bfe4eecd1e5468 Mon Sep 17 00:00:00 2001 From: Joe Becher Date: Thu, 16 Jul 2020 11:11:24 -0400 Subject: [PATCH 06/15] Remove default value to more_patterns, change windows to winPatterns --- lib/codecov.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/codecov.js b/lib/codecov.js index 691c6144..3d9b91f7 100644 --- a/lib/codecov.js +++ b/lib/codecov.js @@ -11,8 +11,7 @@ var detectProvider = require('./detect') var version = 'v' + require('../package.json').version -var patterns, - more_patterns = '' +var patterns, more_patterns, winPatterns var isWindows = process.platform.match(/win32/) || process.platform.match(/win64/) @@ -79,7 +78,7 @@ if (!isWindows) { "-not -path '*/conftest_*.c.gcov'" ).split(' ') } else { - patterns = ( + winPatterns = ( '/a-d /b /s *coverage.* ' + '/s nosetests.xml ' + '/s jacoco*.xml ' + @@ -486,7 +485,7 @@ var upload = function(args, on_success, on_failure) { // @TODO support for a root directory // It's not straightforward due to the nature of the find command _findArgs = [root].concat(patterns) - if (more_patterns.length > 0) { + if (more_patterns) { _findArgs.concat(more_patterns) } _files = execFileSync('find', _findArgs) @@ -496,8 +495,8 @@ var upload = function(args, on_success, on_failure) { } else { // @TODO support for a root directory // It's not straightforward due to the nature of the dir command - _findArgs = [root].concat(patterns) - if (more_patterns.length > 0) { + _findArgs = [root].concat(winPatterns) + if (more_patterns) { _findArgs.concat(more_patterns) } _files = execFileSync('dir', _findArgs) From 46aed7ba52e6a713dced5e81fa04a2761d2eb3ad Mon Sep 17 00:00:00 2001 From: Joe Becher Date: Thu, 16 Jul 2020 11:40:30 -0400 Subject: [PATCH 07/15] Try a colon. --- lib/codecov.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/codecov.js b/lib/codecov.js index 3d9b91f7..08dd8a7e 100644 --- a/lib/codecov.js +++ b/lib/codecov.js @@ -79,7 +79,7 @@ if (!isWindows) { ).split(' ') } else { winPatterns = ( - '/a-d /b /s *coverage.* ' + + '/a:-d /b /s *coverage.* ' + '/s nosetests.xml ' + '/s jacoco*.xml ' + '/s clover.xml ' + From de77ff3a84a33b7eedde23d633b305f7f36a8aa3 Mon Sep 17 00:00:00 2001 From: Joe Becher Date: Thu, 16 Jul 2020 11:45:01 -0400 Subject: [PATCH 08/15] Let's try not using MinGw... --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 53f04412..eff4716f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,7 +19,7 @@ install: - npm install test_script: - - cmd: SET PATH=C:\MinGW\bin;%PATH% +# - cmd: SET PATH=C:\MinGW\bin;%PATH% - npm run test after_test: From 7148c187a783b3dac6d24b34152700f7bbcac352 Mon Sep 17 00:00:00 2001 From: Joe Becher Date: Thu, 16 Jul 2020 11:53:04 -0400 Subject: [PATCH 09/15] What are the chances that Windows has a find? --- appveyor.yml | 2 +- lib/codecov.js | 184 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 123 insertions(+), 63 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index eff4716f..53f04412 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,7 +19,7 @@ install: - npm install test_script: -# - cmd: SET PATH=C:\MinGW\bin;%PATH% + - cmd: SET PATH=C:\MinGW\bin;%PATH% - npm run test after_test: diff --git a/lib/codecov.js b/lib/codecov.js index 08dd8a7e..80a5a50d 100644 --- a/lib/codecov.js +++ b/lib/codecov.js @@ -11,7 +11,7 @@ var detectProvider = require('./detect') var version = 'v' + require('../package.json').version -var patterns, more_patterns, winPatterns +var patterns, more_patterns //, winPatterns var isWindows = process.platform.match(/win32/) || process.platform.match(/win64/) @@ -78,66 +78,126 @@ if (!isWindows) { "-not -path '*/conftest_*.c.gcov'" ).split(' ') } else { - winPatterns = ( - '/a:-d /b /s *coverage.* ' + - '/s nosetests.xml ' + - '/s jacoco*.xml ' + - '/s clover.xml ' + - '/s report.xml ' + - '/s cobertura.xml ' + - '/s luacov.report.out ' + - '/s lcov.info ' + - '/s *.lcov ' + - '/s gcov.info ' + - '/s *.gcov ' + - '/s *.lst' + - '| findstr /i /v \\.sh$ ' + - '| findstr /i /v \\.data$ ' + - '| findstr /i /v \\.py$ ' + - '| findstr /i /v \\.class$ ' + - '| findstr /i /v \\.xcconfig$ ' + - '| findstr /i /v Coverage\\.profdata$ ' + - '| findstr /i /v phpunit-code-coverage\\.xml$ ' + - '| findstr /i /v coverage\\.serialized$ ' + - '| findstr /i /v \\.pyc$ ' + - '| findstr /i /v \\.cfg$ ' + - '| findstr /i /v \\.egg$ ' + - '| findstr /i /v \\.whl$ ' + - '| findstr /i /v \\.html$ ' + - '| findstr /i /v \\.js$ ' + - '| findstr /i /v \\.cpp$ ' + - '| findstr /i /v coverage\\.jade$ ' + - '| findstr /i /v include\\.lst$ ' + - '| findstr /i /v inputFiles\\.lst$ ' + - '| findstr /i /v createdFiles\\.lst$ ' + - '| findstr /i /v coverage\\.html$ ' + - '| findstr /i /v scoverage\\.measurements\\..* ' + - '| findstr /i /v test_.*_coverage\\.txt ' + - '| findstr /i /v \\vendor\\ ' + - '| findstr /i /v \\htmlcov\\ ' + - '| findstr /i /v \\home\\cainus\\ ' + - '| findstr /i /v \\js\\generated\\coverage\\ ' + - '| findstr /i /v \\virtualenv\\ ' + - '| findstr /i /v \\virtualenvs\\ ' + - '| findstr /i /v \\\\.virtualenv\\ ' + - '| findstr /i /v \\\\.virtualenvs\\ ' + - '| findstr /i /v \\\\.env\\ ' + - '| findstr /i /v \\\\.envs\\ ' + - '| findstr /i /v \\env\\ ' + - '| findstr /i /v \\envs\\ ' + - '| findstr /i /v \\\\.venv\\ ' + - '| findstr /i /v \\\\.venvs\\ ' + - '| findstr /i /v \\venv\\ ' + - '| findstr /i /v \\venvs\\ ' + - '| findstr /i /v \\\\.git\\ ' + - '| findstr /i /v \\\\.hg\\ ' + - '| findstr /i /v \\\\.tox\\ ' + - '| findstr /i /v \\__pycache__\\ ' + - '| findstr /i /v \\\\.egg-info* ' + - '| findstr /i /v \\\\$bower_components\\ ' + - '| findstr /i /v \\node_modules\\ ' + - '| findstr /i /v \\conftest_.*\\.c\\.gcov ' + patterns = ( + "-type f -name '*coverage.*' " + + "-or -name 'nosetests.xml' " + + "-or -name 'jacoco*.xml' " + + "-or -name 'clover.xml' " + + "-or -name 'report.xml' " + + "-or -name 'cobertura.xml' " + + "-or -name 'luacov.report.out' " + + "-or -name 'lcov.info' " + + "-or -name '*.lcov' " + + "-or -name 'gcov.info' " + + "-or -name '*.gcov' " + + "-or -name '*.lst' " + + "-not -name '*.sh' " + + "-not -name '*.data' " + + "-not -name '*.py' " + + "-not -name '*.class' " + + "-not -name '*.xcconfig' " + + "-not -name 'Coverage.profdata' " + + "-not -name 'phpunit-code-coverage.xml' " + + "-not -name 'coverage.serialized' " + + "-not -name '*.pyc' " + + "-not -name '*.cfg' " + + "-not -name '*.egg' " + + "-not -name '*.whl' " + + "-not -name '*.html' " + + "-not -name '*.js' " + + "-not -name '*.cpp' " + + "-not -name 'coverage.jade' " + + "-not -name 'include.lst' " + + "-not -name 'inputFiles.lst' " + + "-not -name 'createdFiles.lst' " + + "-not -name 'coverage.html' " + + "-not -name 'scoverage.measurements.*' " + + "-not -name 'test_*_coverage.txt' " + + "-not -path '*/vendor/*' " + + "-not -path '*/htmlcov/*' " + + "-not -path '*/home/cainus/*' " + + "-not -path '*/virtualenv/*' " + + "-not -path '*/js/generated/coverage/*' " + + "-not -path '*/.virtualenv/*' " + + "-not -path '*/virtualenvs/*' " + + "-not -path '*/.virtualenvs/*' " + + "-not -path '*/.env/*' " + + "-not -path '*/.envs/*' " + + "-not -path '*/env/*' " + + "-not -path '*/envs/*' " + + "-not -path '*/.venv/*' " + + "-not -path '*/.venvs/*' " + + "-not -path '*/venv/*' " + + "-not -path '*/venvs/*' " + + "-not -path '*/.git/*' " + + "-not -path '*/.hg/*' " + + "-not -path '*/.tox/*' " + + "-not -path '*/__pycache__/*' " + + "-not -path '*/.egg-info*' " + + "-not -path '*/$bower_components/*' " + + "-not -path '*/node_modules/*' " + + "-not -path '*/conftest_*.c.gcov'" ).split(' ') + // winPatterns = ( + // '/a:-d /b /s *coverage.* ' + + // '/s nosetests.xml ' + + // '/s jacoco*.xml ' + + // '/s clover.xml ' + + // '/s report.xml ' + + // '/s cobertura.xml ' + + // '/s luacov.report.out ' + + // '/s lcov.info ' + + // '/s *.lcov ' + + // '/s gcov.info ' + + // '/s *.gcov ' + + // '/s *.lst' + + // '| findstr /i /v \\.sh$ ' + + // '| findstr /i /v \\.data$ ' + + // '| findstr /i /v \\.py$ ' + + // '| findstr /i /v \\.class$ ' + + // '| findstr /i /v \\.xcconfig$ ' + + // '| findstr /i /v Coverage\\.profdata$ ' + + // '| findstr /i /v phpunit-code-coverage\\.xml$ ' + + // '| findstr /i /v coverage\\.serialized$ ' + + // '| findstr /i /v \\.pyc$ ' + + // '| findstr /i /v \\.cfg$ ' + + // '| findstr /i /v \\.egg$ ' + + // '| findstr /i /v \\.whl$ ' + + // '| findstr /i /v \\.html$ ' + + // '| findstr /i /v \\.js$ ' + + // '| findstr /i /v \\.cpp$ ' + + // '| findstr /i /v coverage\\.jade$ ' + + // '| findstr /i /v include\\.lst$ ' + + // '| findstr /i /v inputFiles\\.lst$ ' + + // '| findstr /i /v createdFiles\\.lst$ ' + + // '| findstr /i /v coverage\\.html$ ' + + // '| findstr /i /v scoverage\\.measurements\\..* ' + + // '| findstr /i /v test_.*_coverage\\.txt ' + + // '| findstr /i /v \\vendor\\ ' + + // '| findstr /i /v \\htmlcov\\ ' + + // '| findstr /i /v \\home\\cainus\\ ' + + // '| findstr /i /v \\js\\generated\\coverage\\ ' + + // '| findstr /i /v \\virtualenv\\ ' + + // '| findstr /i /v \\virtualenvs\\ ' + + // '| findstr /i /v \\\\.virtualenv\\ ' + + // '| findstr /i /v \\\\.virtualenvs\\ ' + + // '| findstr /i /v \\\\.env\\ ' + + // '| findstr /i /v \\\\.envs\\ ' + + // '| findstr /i /v \\env\\ ' + + // '| findstr /i /v \\envs\\ ' + + // '| findstr /i /v \\\\.venv\\ ' + + // '| findstr /i /v \\\\.venvs\\ ' + + // '| findstr /i /v \\venv\\ ' + + // '| findstr /i /v \\venvs\\ ' + + // '| findstr /i /v \\\\.git\\ ' + + // '| findstr /i /v \\\\.hg\\ ' + + // '| findstr /i /v \\\\.tox\\ ' + + // '| findstr /i /v \\__pycache__\\ ' + + // '| findstr /i /v \\\\.egg-info* ' + + // '| findstr /i /v \\\\$bower_components\\ ' + + // '| findstr /i /v \\node_modules\\ ' + + // '| findstr /i /v \\conftest_.*\\.c\\.gcov ' + // ).split(' ') } var sendToCodecovV2 = function( @@ -495,11 +555,11 @@ var upload = function(args, on_success, on_failure) { } else { // @TODO support for a root directory // It's not straightforward due to the nature of the dir command - _findArgs = [root].concat(winPatterns) + _findArgs = [root].concat(patterns) if (more_patterns) { _findArgs.concat(more_patterns) } - _files = execFileSync('dir', _findArgs) + _files = execFileSync('find', _findArgs) .toString() .trim() .split('\r\n') From e9bd861419c51664fefc88eabedbf2559b9e9f7d Mon Sep 17 00:00:00 2001 From: Joe Becher Date: Thu, 16 Jul 2020 12:04:40 -0400 Subject: [PATCH 10/15] Put it back --- lib/codecov.js | 184 +++++++++++++++++-------------------------------- 1 file changed, 62 insertions(+), 122 deletions(-) diff --git a/lib/codecov.js b/lib/codecov.js index 80a5a50d..08dd8a7e 100644 --- a/lib/codecov.js +++ b/lib/codecov.js @@ -11,7 +11,7 @@ var detectProvider = require('./detect') var version = 'v' + require('../package.json').version -var patterns, more_patterns //, winPatterns +var patterns, more_patterns, winPatterns var isWindows = process.platform.match(/win32/) || process.platform.match(/win64/) @@ -78,126 +78,66 @@ if (!isWindows) { "-not -path '*/conftest_*.c.gcov'" ).split(' ') } else { - patterns = ( - "-type f -name '*coverage.*' " + - "-or -name 'nosetests.xml' " + - "-or -name 'jacoco*.xml' " + - "-or -name 'clover.xml' " + - "-or -name 'report.xml' " + - "-or -name 'cobertura.xml' " + - "-or -name 'luacov.report.out' " + - "-or -name 'lcov.info' " + - "-or -name '*.lcov' " + - "-or -name 'gcov.info' " + - "-or -name '*.gcov' " + - "-or -name '*.lst' " + - "-not -name '*.sh' " + - "-not -name '*.data' " + - "-not -name '*.py' " + - "-not -name '*.class' " + - "-not -name '*.xcconfig' " + - "-not -name 'Coverage.profdata' " + - "-not -name 'phpunit-code-coverage.xml' " + - "-not -name 'coverage.serialized' " + - "-not -name '*.pyc' " + - "-not -name '*.cfg' " + - "-not -name '*.egg' " + - "-not -name '*.whl' " + - "-not -name '*.html' " + - "-not -name '*.js' " + - "-not -name '*.cpp' " + - "-not -name 'coverage.jade' " + - "-not -name 'include.lst' " + - "-not -name 'inputFiles.lst' " + - "-not -name 'createdFiles.lst' " + - "-not -name 'coverage.html' " + - "-not -name 'scoverage.measurements.*' " + - "-not -name 'test_*_coverage.txt' " + - "-not -path '*/vendor/*' " + - "-not -path '*/htmlcov/*' " + - "-not -path '*/home/cainus/*' " + - "-not -path '*/virtualenv/*' " + - "-not -path '*/js/generated/coverage/*' " + - "-not -path '*/.virtualenv/*' " + - "-not -path '*/virtualenvs/*' " + - "-not -path '*/.virtualenvs/*' " + - "-not -path '*/.env/*' " + - "-not -path '*/.envs/*' " + - "-not -path '*/env/*' " + - "-not -path '*/envs/*' " + - "-not -path '*/.venv/*' " + - "-not -path '*/.venvs/*' " + - "-not -path '*/venv/*' " + - "-not -path '*/venvs/*' " + - "-not -path '*/.git/*' " + - "-not -path '*/.hg/*' " + - "-not -path '*/.tox/*' " + - "-not -path '*/__pycache__/*' " + - "-not -path '*/.egg-info*' " + - "-not -path '*/$bower_components/*' " + - "-not -path '*/node_modules/*' " + - "-not -path '*/conftest_*.c.gcov'" + winPatterns = ( + '/a:-d /b /s *coverage.* ' + + '/s nosetests.xml ' + + '/s jacoco*.xml ' + + '/s clover.xml ' + + '/s report.xml ' + + '/s cobertura.xml ' + + '/s luacov.report.out ' + + '/s lcov.info ' + + '/s *.lcov ' + + '/s gcov.info ' + + '/s *.gcov ' + + '/s *.lst' + + '| findstr /i /v \\.sh$ ' + + '| findstr /i /v \\.data$ ' + + '| findstr /i /v \\.py$ ' + + '| findstr /i /v \\.class$ ' + + '| findstr /i /v \\.xcconfig$ ' + + '| findstr /i /v Coverage\\.profdata$ ' + + '| findstr /i /v phpunit-code-coverage\\.xml$ ' + + '| findstr /i /v coverage\\.serialized$ ' + + '| findstr /i /v \\.pyc$ ' + + '| findstr /i /v \\.cfg$ ' + + '| findstr /i /v \\.egg$ ' + + '| findstr /i /v \\.whl$ ' + + '| findstr /i /v \\.html$ ' + + '| findstr /i /v \\.js$ ' + + '| findstr /i /v \\.cpp$ ' + + '| findstr /i /v coverage\\.jade$ ' + + '| findstr /i /v include\\.lst$ ' + + '| findstr /i /v inputFiles\\.lst$ ' + + '| findstr /i /v createdFiles\\.lst$ ' + + '| findstr /i /v coverage\\.html$ ' + + '| findstr /i /v scoverage\\.measurements\\..* ' + + '| findstr /i /v test_.*_coverage\\.txt ' + + '| findstr /i /v \\vendor\\ ' + + '| findstr /i /v \\htmlcov\\ ' + + '| findstr /i /v \\home\\cainus\\ ' + + '| findstr /i /v \\js\\generated\\coverage\\ ' + + '| findstr /i /v \\virtualenv\\ ' + + '| findstr /i /v \\virtualenvs\\ ' + + '| findstr /i /v \\\\.virtualenv\\ ' + + '| findstr /i /v \\\\.virtualenvs\\ ' + + '| findstr /i /v \\\\.env\\ ' + + '| findstr /i /v \\\\.envs\\ ' + + '| findstr /i /v \\env\\ ' + + '| findstr /i /v \\envs\\ ' + + '| findstr /i /v \\\\.venv\\ ' + + '| findstr /i /v \\\\.venvs\\ ' + + '| findstr /i /v \\venv\\ ' + + '| findstr /i /v \\venvs\\ ' + + '| findstr /i /v \\\\.git\\ ' + + '| findstr /i /v \\\\.hg\\ ' + + '| findstr /i /v \\\\.tox\\ ' + + '| findstr /i /v \\__pycache__\\ ' + + '| findstr /i /v \\\\.egg-info* ' + + '| findstr /i /v \\\\$bower_components\\ ' + + '| findstr /i /v \\node_modules\\ ' + + '| findstr /i /v \\conftest_.*\\.c\\.gcov ' ).split(' ') - // winPatterns = ( - // '/a:-d /b /s *coverage.* ' + - // '/s nosetests.xml ' + - // '/s jacoco*.xml ' + - // '/s clover.xml ' + - // '/s report.xml ' + - // '/s cobertura.xml ' + - // '/s luacov.report.out ' + - // '/s lcov.info ' + - // '/s *.lcov ' + - // '/s gcov.info ' + - // '/s *.gcov ' + - // '/s *.lst' + - // '| findstr /i /v \\.sh$ ' + - // '| findstr /i /v \\.data$ ' + - // '| findstr /i /v \\.py$ ' + - // '| findstr /i /v \\.class$ ' + - // '| findstr /i /v \\.xcconfig$ ' + - // '| findstr /i /v Coverage\\.profdata$ ' + - // '| findstr /i /v phpunit-code-coverage\\.xml$ ' + - // '| findstr /i /v coverage\\.serialized$ ' + - // '| findstr /i /v \\.pyc$ ' + - // '| findstr /i /v \\.cfg$ ' + - // '| findstr /i /v \\.egg$ ' + - // '| findstr /i /v \\.whl$ ' + - // '| findstr /i /v \\.html$ ' + - // '| findstr /i /v \\.js$ ' + - // '| findstr /i /v \\.cpp$ ' + - // '| findstr /i /v coverage\\.jade$ ' + - // '| findstr /i /v include\\.lst$ ' + - // '| findstr /i /v inputFiles\\.lst$ ' + - // '| findstr /i /v createdFiles\\.lst$ ' + - // '| findstr /i /v coverage\\.html$ ' + - // '| findstr /i /v scoverage\\.measurements\\..* ' + - // '| findstr /i /v test_.*_coverage\\.txt ' + - // '| findstr /i /v \\vendor\\ ' + - // '| findstr /i /v \\htmlcov\\ ' + - // '| findstr /i /v \\home\\cainus\\ ' + - // '| findstr /i /v \\js\\generated\\coverage\\ ' + - // '| findstr /i /v \\virtualenv\\ ' + - // '| findstr /i /v \\virtualenvs\\ ' + - // '| findstr /i /v \\\\.virtualenv\\ ' + - // '| findstr /i /v \\\\.virtualenvs\\ ' + - // '| findstr /i /v \\\\.env\\ ' + - // '| findstr /i /v \\\\.envs\\ ' + - // '| findstr /i /v \\env\\ ' + - // '| findstr /i /v \\envs\\ ' + - // '| findstr /i /v \\\\.venv\\ ' + - // '| findstr /i /v \\\\.venvs\\ ' + - // '| findstr /i /v \\venv\\ ' + - // '| findstr /i /v \\venvs\\ ' + - // '| findstr /i /v \\\\.git\\ ' + - // '| findstr /i /v \\\\.hg\\ ' + - // '| findstr /i /v \\\\.tox\\ ' + - // '| findstr /i /v \\__pycache__\\ ' + - // '| findstr /i /v \\\\.egg-info* ' + - // '| findstr /i /v \\\\$bower_components\\ ' + - // '| findstr /i /v \\node_modules\\ ' + - // '| findstr /i /v \\conftest_.*\\.c\\.gcov ' - // ).split(' ') } var sendToCodecovV2 = function( @@ -555,11 +495,11 @@ var upload = function(args, on_success, on_failure) { } else { // @TODO support for a root directory // It's not straightforward due to the nature of the dir command - _findArgs = [root].concat(patterns) + _findArgs = [root].concat(winPatterns) if (more_patterns) { _findArgs.concat(more_patterns) } - _files = execFileSync('find', _findArgs) + _files = execFileSync('dir', _findArgs) .toString() .trim() .split('\r\n') From caca56c62d1e8e8ccdbd9e367bb1073691cf2b9f Mon Sep 17 00:00:00 2001 From: Joe Becher Date: Thu, 16 Jul 2020 12:32:32 -0400 Subject: [PATCH 11/15] Reverting Windows side so this can me merged in time if needed. --- lib/codecov.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/codecov.js b/lib/codecov.js index 08dd8a7e..70d651bb 100644 --- a/lib/codecov.js +++ b/lib/codecov.js @@ -499,7 +499,7 @@ var upload = function(args, on_success, on_failure) { if (more_patterns) { _findArgs.concat(more_patterns) } - _files = execFileSync('dir', _findArgs) + _files = execSync('dir ' + patterns + winPatterns) .toString() .trim() .split('\r\n') From 40caa82fd469e9c6354ee5de8b325870692cb1b1 Mon Sep 17 00:00:00 2001 From: Joe Becher Date: Thu, 16 Jul 2020 12:39:35 -0400 Subject: [PATCH 12/15] Reverting Windows side so this can me merged in time if needed. --- lib/codecov.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/codecov.js b/lib/codecov.js index 70d651bb..f039f87e 100644 --- a/lib/codecov.js +++ b/lib/codecov.js @@ -499,7 +499,7 @@ var upload = function(args, on_success, on_failure) { if (more_patterns) { _findArgs.concat(more_patterns) } - _files = execSync('dir ' + patterns + winPatterns) + _files = execSync('dir ' + winPatterns + more_patterns) .toString() .trim() .split('\r\n') From aa09765c80c45be0ca7102a23d50bc006a2c7143 Mon Sep 17 00:00:00 2001 From: Joe Becher Date: Fri, 17 Jul 2020 11:52:00 -0400 Subject: [PATCH 13/15] Update lib/codecov.js Co-authored-by: Guillaume St-Pierre --- lib/codecov.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/codecov.js b/lib/codecov.js index f039f87e..af316373 100644 --- a/lib/codecov.js +++ b/lib/codecov.js @@ -499,7 +499,7 @@ var upload = function(args, on_success, on_failure) { if (more_patterns) { _findArgs.concat(more_patterns) } - _files = execSync('dir ' + winPatterns + more_patterns) + _files = execSync('dir ' + winPatterns.join(' ') + more_patterns) .toString() .trim() .split('\r\n') From 1dd9c25f3ae22f52f047464944869eef2c6a5a8d Mon Sep 17 00:00:00 2001 From: Joe Becher Date: Fri, 17 Jul 2020 11:59:37 -0400 Subject: [PATCH 14/15] Update lib/codecov.js Co-authored-by: Guillaume St-Pierre --- lib/codecov.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/codecov.js b/lib/codecov.js index af316373..1696ceea 100644 --- a/lib/codecov.js +++ b/lib/codecov.js @@ -11,7 +11,7 @@ var detectProvider = require('./detect') var version = 'v' + require('../package.json').version -var patterns, more_patterns, winPatterns +var patterns, more_patterns, winPatterns = '' var isWindows = process.platform.match(/win32/) || process.platform.match(/win64/) From 9f0c2c94e4781d1940c59984564128a67106beda Mon Sep 17 00:00:00 2001 From: Joe Becher Date: Fri, 17 Jul 2020 12:05:55 -0400 Subject: [PATCH 15/15] Set initial values --- lib/codecov.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/codecov.js b/lib/codecov.js index 1696ceea..da8b6e52 100644 --- a/lib/codecov.js +++ b/lib/codecov.js @@ -11,7 +11,9 @@ var detectProvider = require('./detect') var version = 'v' + require('../package.json').version -var patterns, more_patterns, winPatterns = '' +var patterns = '' +var more_patterns = '' +var winPatterns = '' var isWindows = process.platform.match(/win32/) || process.platform.match(/win64/)