[ci] Revise code coverage tracking implementation

Author: evilaliv3

.github/workflows/scripts/run_tests_backend.sh

@@ -10,7 +10,7 @@ setupBackend() {
 setupClient() {
   cd $GITHUB_WORKSPACE/client  # to install frontend dependencies
   npm install -d
-  ./node_modules/grunt/bin/grunt build_and_instrument
+  ./node_modules/grunt/bin/grunt build
 }
 
 echo "Running setup"

.github/workflows/scripts/run_tests_client.sh

@@ -10,7 +10,7 @@ setupBackend() {
 setupClient() {
   cd $GITHUB_WORKSPACE/client  # to install frontend dependencies
   npm install -d
-  ./node_modules/grunt/bin/grunt build_and_instrument
+  ./node_modules/grunt/bin/grunt build_for_testing
 }
 
 echo "Running setup"

client/Gruntfile.js

@@ -195,7 +195,7 @@ module.exports = function(grunt) {
       npx_build: {
         command: "NG_BUILD_OPTIMIZE_CHUNKS=1 npx ng build --configuration=production"
       },
-      npx_build_and_instrument: {
+      npx_build_for_testing: {
         command: "NG_BUILD_OPTIMIZE_CHUNKS=1 npx ng build --configuration=testing && nyc instrument dist --in-place"
       },
       brotli_compress: {
@@ -824,10 +824,8 @@ module.exports = function(grunt) {
 
   grunt.registerTask("package", ["copy:build", "webpack", "string-replace", "postcss", "copy:package"]);
 
-  grunt.registerTask("build", ["clean", "shell:npx_build", "package"]);
-
-  grunt.registerTask("build_and_compress", ["clean", "build", "shell:brotli_compress"]);
+  grunt.registerTask("build", ["clean", "shell:npx_build", "package", "shell:brotli_compress", "clean:tmp"]);
 
-  grunt.registerTask("build_and_instrument", ["clean", "shell:npx_build_and_instrument", "package"]);
+  grunt.registerTask("build_for_testing", ["clean", "shell:npx_build_for_testing", "package", "shell:brotli_compress", "clean:tmp"]);
 };
 

client/package.json

@@ -2,7 +2,7 @@
   "name": "globaleaks",
   "version": "5.0.46",
   "scripts": {
-    "test": "npx cypress run --browser=chromium && npx nyc report --reporter=lcov --report-dir=./cypress/coverage --reporter=text-summary --browser electron",
+    "test": "npx cypress run --browser=chromium",
     "eslint": "ng lint",
     "stylelint": "npx stylelint 'app/css/**/*.css'"
   },