[ci] Revise code coverage tracking implementation

globaleaks · Feb 6, 2025 · c228e90 · c228e90
1 parent 8634334
commit c228e90
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/.github/workflows/scripts/run_tests_backend.sh b/.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"

diff --git a/.github/workflows/scripts/run_tests_client.sh b/.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"

diff --git a/client/Gruntfile.js b/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"]);
 };
 
diff --git a/client/package.json b/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'"
   },
@@ -78,8 +78,6 @@
     "@angular/compiler-cli": "18.2.13",
     "@cypress/code-coverage": "3.13.11",
     "@cypress/schematic": "3.0.0",
-    "@istanbuljs/nyc-config-typescript": "1.0.2",
-    "@jsdevtools/coverage-istanbul-loader": "3.0.5",
     "@lodder/grunt-postcss": "3.1.1",
     "@popperjs/core": "2.11.8",
     "angular-eslint": "19.0.2",
@@ -96,7 +94,6 @@
     "load-grunt-tasks": "5.1.0",
     "node-gettext": "3.0.0",
     "npm-check-updates": "17.1.14",
-    "nyc": "17.1.0",
     "postcss": "8.5.1",
     "postcss-rtlcss": "5.6.0",
     "stylelint": "16.14.1",