From 2646804a31766e051cf1fe944dbe00c748851a91 Mon Sep 17 00:00:00 2001 From: gabrielburnworth Date: Wed, 17 Jan 2024 12:14:32 -0800 Subject: [PATCH] switch to coveralls coverage reporter --- .circleci/config.yml | 10 ++++++++-- package.json | 2 -- run_all_ci_tasks.sh | 5 +---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5eb39b83c1..ee5d6e0e59 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,10 +88,16 @@ commands: - run: name: Report coverage to Coveralls command: | - if [ "$COVERAGE_AVAILABLE" ] + if [ "$CIRCLE_BRANCH" == "staging" ]; then set +eo pipefail; fi + if [ "$COVERAGE_AVAILABLE" ] && [ "$COVERALLS_REPO_TOKEN" ] then - sudo docker compose run -e COVERALLS_REPO_TOKEN="$COVERALLS_REPO_TOKEN" web npm run coverage || [ $CIRCLE_BRANCH == "staging" ] + curl -sLO https://github.com/coverallsapp/coverage-reporter/releases/latest/download/coveralls-linux.tar.gz + curl -sLO https://github.com/coverallsapp/coverage-reporter/releases/latest/download/coveralls-checksums.txt + cat coveralls-checksums.txt | grep coveralls-linux.tar.gz | sha256sum --check + tar -xzf coveralls-linux.tar.gz + ./coveralls report coverage_fe/lcov.info fi + if [ "$CIRCLE_BRANCH" == "staging" ]; then echo; fi when: always # change to `on_success` for a stricter comparison diff --git a/package.json b/package.json index d681649647..1c91b6b134 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,6 @@ "url": "https://github.com/farmbot/farmbot-web-app" }, "scripts": { - "coverage": "cat **/*lcov.info | ./node_modules/coveralls/bin/coveralls.js", "test-very-slow": "node --expose-gc ./node_modules/.bin/jest -i --colors --coverage", "test-slow": "./node_modules/.bin/jest -w 6 --colors", "test": "./node_modules/.bin/jest -w 5 --no-coverage", @@ -85,7 +84,6 @@ "@typescript-eslint/eslint-plugin": "6.16.0", "@typescript-eslint/parser": "6.16.0", "@wojtekmaj/enzyme-adapter-react-17": "0.8.0", - "coveralls": "3.1.1", "enzyme": "3.11.0", "eslint": "8.56.0", "eslint-plugin-eslint-comments": "3.2.0", diff --git a/run_all_ci_tasks.sh b/run_all_ci_tasks.sh index 14bac878d8..f1b169f61b 100755 --- a/run_all_ci_tasks.sh +++ b/run_all_ci_tasks.sh @@ -9,7 +9,4 @@ P2=$! sudo docker compose run web npm run test-slow & P3=$! -sudo docker compose run web npm run coverage & -P4=$! - -wait $P1 $P2 $P3 $P4 +wait $P1 $P2 $P3