Update Travis and Sonar settings

silentsoft · Mar 8, 2022 · 192ee83 · 192ee83
1 parent 5cc4ad5
commit 192ee83
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,11 +6,11 @@ jobs:
         directories:
           - "$HOME/.m2"
       before_install:
-        # "node" is an alias for the latest version
-        - nvm install node
+        - nvm install $(< .nvmrc)
       script:
-        # the following command line builds the project, runs the tests with coverage and then execute the SonarCloud analysis
-        - mvn clean verify sonar:sonar -Pcoverage -DskipRedundantTests -Dsonar.projectKey=silentsoft_hits -Dsonar.sources=src/main/java,src/main/react
+        - npm install
+        - npm test
+        - mvn clean verify sonar:sonar -Pcoverage -DskipRedundantTests -Dsonar.projectKey=silentsoft_hits -Dsonar.sources=src/main/java,src/main/react -Dsonar.javascript.lcov.reportPaths=coverage/lcov.info
 
 git:
   depth: false

diff --git a/config-overrides.js b/config-overrides.js
@@ -23,7 +23,8 @@ module.exports = {
         ];
         config.collectCoverage = true;
         config.collectCoverageFrom = [
-            '<rootDir>/**/*.{js,jsx,ts,tsx}'
+            '**/*.{js,jsx,ts,tsx}',
+            '!**/*.d.ts'
         ];
         config.coverageDirectory = path.resolve(__dirname, 'coverage');
         return config;