From 46030c36b0f316c2854ddee099d1ee5d04b32d53 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 28 Jan 2021 19:13:31 -0500 Subject: [PATCH 1/5] Add codecov-result.json --- .circleci/config.yml | 2 +- SHA1SUM | 2 +- SHA256SUM | 2 +- SHA512SUM | 2 +- codecov | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 23e2568f..6314dc00 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: - run: name: Upload Codecov command: | - bash ./codecov -z coverage/codecov-result.json -Z + bash ./codecov -Z - store_artifacts: path: coverage deploy: diff --git a/SHA1SUM b/SHA1SUM index af7b2c81..f813e09a 100644 --- a/SHA1SUM +++ b/SHA1SUM @@ -1 +1 @@ -c03399a861d5dbcfc7ca3c5ce45eb4ee7d3b2225 codecov +3cde295f1aea22c8322e8b54269024b30ffa5b52 codecov diff --git a/SHA256SUM b/SHA256SUM index 8bf8fadf..62c9d98a 100644 --- a/SHA256SUM +++ b/SHA256SUM @@ -1 +1 @@ -670815401d1cee718ba051a33cfd92e2a670906a682c800306d3f89f10cf1e42 codecov +0bb97ce95e2289d87faa0a23f79e7f9e28eb10283945871d3d53759ce99a90d7 codecov diff --git a/SHA512SUM b/SHA512SUM index fc28e45e..c6b5f4cf 100644 --- a/SHA512SUM +++ b/SHA512SUM @@ -1 +1 @@ -d4281a64f2528b9365ce08f6d41477ffd3ef8886f18ace3dab20be468e88a6020c28a2bad12d6d2cc394e7e6ef035bafc2c1f24a3fbed2cbf1c415406bd60c44 codecov +a768863c63bc0a7c9bec9ccbcb1a494b36f349bd832eb142326caf9daf10c801df22ad275c519d4223bffe97dcb43271d7f761dd99ffe7b4a9ec3f585933d128 codecov diff --git a/codecov b/codecov index 7898ea36..bb53139f 100755 --- a/codecov +++ b/codecov @@ -1257,6 +1257,7 @@ $PWD/coverage.xml" -or -name .virtualenvs \ -or -name .env \ -or -name .envs \ + -or -name codecov-result.json \ -or -name env \ -or -name .yarn-cache \ -or -name envs \ From 0cae9cc78abe596fcc71a23917176b4aae984901 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 28 Jan 2021 19:13:49 -0500 Subject: [PATCH 2/5] alpha --- SHA1SUM | 2 +- SHA256SUM | 2 +- SHA512SUM | 2 +- codecov | 34 +++++++++++++++++----------------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/SHA1SUM b/SHA1SUM index f813e09a..32722f24 100644 --- a/SHA1SUM +++ b/SHA1SUM @@ -1 +1 @@ -3cde295f1aea22c8322e8b54269024b30ffa5b52 codecov +d662ae65e40d8a5279f4088761281a057181f824 codecov diff --git a/SHA256SUM b/SHA256SUM index 62c9d98a..81940614 100644 --- a/SHA256SUM +++ b/SHA256SUM @@ -1 +1 @@ -0bb97ce95e2289d87faa0a23f79e7f9e28eb10283945871d3d53759ce99a90d7 codecov +e5e51160c9b9cd993e9bcc8a2d9d84d44d0b77ac6b20116dd6447a90d375dda0 codecov diff --git a/SHA512SUM b/SHA512SUM index c6b5f4cf..df62e129 100644 --- a/SHA512SUM +++ b/SHA512SUM @@ -1 +1 @@ -a768863c63bc0a7c9bec9ccbcb1a494b36f349bd832eb142326caf9daf10c801df22ad275c519d4223bffe97dcb43271d7f761dd99ffe7b4a9ec3f585933d128 codecov +91ed8d93e2910351eee039c44eac93a067156d0b5267261e9b61b6978f5cd7abef6cf0a11c02a70d3a7ef7d4bf329b77d4bce5151cc1b4fe54018a862c0ad737 codecov diff --git a/codecov b/codecov index bb53139f..6fafc88c 100755 --- a/codecov +++ b/codecov @@ -1249,30 +1249,30 @@ $PWD/coverage.xml" patterns="find $search_in \( \ -name vendor \ - -or -name htmlcov \ - -or -name virtualenv \ - -or -name js/generated/coverage \ - -or -name .virtualenv \ - -or -name virtualenvs \ - -or -name .virtualenvs \ + -or -name '$bower_components' \ + -or -name '.egg-info*' \ + -or -name 'conftest_*.c.gcov' \ -or -name .env \ -or -name .envs \ - -or -name codecov-result.json \ - -or -name env \ - -or -name .yarn-cache \ - -or -name envs \ - -or -name .venv \ - -or -name .venvs \ - -or -name venv \ - -or -name venvs \ -or -name .git \ -or -name .hg \ -or -name .tox \ + -or -name .venv \ + -or -name .venvs \ + -or -name .virtualenv \ + -or -name .virtualenvs \ + -or -name .yarn-cache \ -or -name __pycache__ \ - -or -name '.egg-info*' \ - -or -name '$bower_components' \ + -or -name codecov-result.json \ + -or -name env \ + -or -name envs \ + -or -name htmlcov \ + -or -name js/generated/coverage \ -or -name node_modules \ - -or -name 'conftest_*.c.gcov' \ + -or -name venv \ + -or -name venvs \ + -or -name virtualenv \ + -or -name virtualenvs \ \) -prune -or \ -type f \( -name '*coverage*.*' \ -or -name '*.clover' \ From e4b369a3030d68005263a4b722f7baf48ee10317 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 28 Jan 2021 19:15:12 -0500 Subject: [PATCH 3/5] More specific folder --- SHA1SUM | 2 +- SHA256SUM | 2 +- SHA512SUM | 2 +- codecov | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SHA1SUM b/SHA1SUM index 32722f24..3593b4ae 100644 --- a/SHA1SUM +++ b/SHA1SUM @@ -1 +1 @@ -d662ae65e40d8a5279f4088761281a057181f824 codecov +507e6d9b89030b7874879c512238882664676c65 codecov diff --git a/SHA256SUM b/SHA256SUM index 81940614..5e9fe170 100644 --- a/SHA256SUM +++ b/SHA256SUM @@ -1 +1 @@ -e5e51160c9b9cd993e9bcc8a2d9d84d44d0b77ac6b20116dd6447a90d375dda0 codecov +f07c0a6278bd6e14d717967eb6df171c3d98940056c827b2001f98eb4ede061a codecov diff --git a/SHA512SUM b/SHA512SUM index df62e129..ea67e437 100644 --- a/SHA512SUM +++ b/SHA512SUM @@ -1 +1 @@ -91ed8d93e2910351eee039c44eac93a067156d0b5267261e9b61b6978f5cd7abef6cf0a11c02a70d3a7ef7d4bf329b77d4bce5151cc1b4fe54018a862c0ad737 codecov +03ba9ff0d0408898952e3f607598007e0d7c06ec7066da3bab0723d84a462009ec58918853322f54930853c8d5b011941820e6d27bd6c2a2e0d7903ca1e8341b codecov diff --git a/codecov b/codecov index 6fafc88c..0621a1cf 100755 --- a/codecov +++ b/codecov @@ -1263,7 +1263,7 @@ $PWD/coverage.xml" -or -name .virtualenvs \ -or -name .yarn-cache \ -or -name __pycache__ \ - -or -name codecov-result.json \ + -or -name coverage/codecov-result.json \ -or -name env \ -or -name envs \ -or -name htmlcov \ From 7dde05905539c13849a505da5094961df8688353 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 28 Jan 2021 19:17:44 -0500 Subject: [PATCH 4/5] Dont add to prune list --- SHA1SUM | 2 +- SHA256SUM | 2 +- SHA512SUM | 2 +- codecov | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SHA1SUM b/SHA1SUM index 3593b4ae..7ddacdc8 100644 --- a/SHA1SUM +++ b/SHA1SUM @@ -1 +1 @@ -507e6d9b89030b7874879c512238882664676c65 codecov +a9f7fe8001d7f1cc21063fec88e6a3a1f2f896b4 codecov diff --git a/SHA256SUM b/SHA256SUM index 5e9fe170..84745334 100644 --- a/SHA256SUM +++ b/SHA256SUM @@ -1 +1 @@ -f07c0a6278bd6e14d717967eb6df171c3d98940056c827b2001f98eb4ede061a codecov +49b78b3e7c9138b57ad5aa90c0845860028011485eedcc4077a5f2458913c1a7 codecov diff --git a/SHA512SUM b/SHA512SUM index ea67e437..ccb227a7 100644 --- a/SHA512SUM +++ b/SHA512SUM @@ -1 +1 @@ -03ba9ff0d0408898952e3f607598007e0d7c06ec7066da3bab0723d84a462009ec58918853322f54930853c8d5b011941820e6d27bd6c2a2e0d7903ca1e8341b codecov +e4a906fcd5498dbe9bc31b54b233f83228f423de641013cfd7bf3c4d8f40a7da73e48d0a964936696b9e08ca85c1de78103d3bfbe66d281ae348307fa5c94500 codecov diff --git a/codecov b/codecov index 0621a1cf..a555f986 100755 --- a/codecov +++ b/codecov @@ -1263,7 +1263,6 @@ $PWD/coverage.xml" -or -name .virtualenvs \ -or -name .yarn-cache \ -or -name __pycache__ \ - -or -name coverage/codecov-result.json \ -or -name env \ -or -name envs \ -or -name htmlcov \ @@ -1284,6 +1283,7 @@ $PWD/coverage.xml" -or -name 'cobertura.xml' \ -or -name 'codecov.*' \ -or -name 'cover.out' \ + -or -name 'codecov-result.json' \ -or -name 'coverage-final.json' \ -or -name 'excoveralls.json' \ -or -name 'gcov.info' \ From d82cc5b41ede278cdd224acfa9b45c21ed4bf736 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 28 Jan 2021 19:19:09 -0500 Subject: [PATCH 5/5] Remove unneeded deps --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6314dc00..65c03b5b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,10 +13,8 @@ jobs: - run: name: Install Ruby dependencies command: | - gem install json - gem install simplecov - gem install codecov gem install bashcov + gem install codecov - shellcheck/install - run: name: Run Tests