Fix coverage for sonarcloud

[rbdr/cologne] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9679aec6c3c71030ec49b724afb3deb2183fb29e..fe65211a62a42c21a38c40713b697f3fc3dd950b 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,10 @@
+.only-default: &only-default
+  only:
+    - branches
+    - merge_requests
+    - tags
+    - refs
+

 image: node:14
 
 variables:
 image: node:14
 
 variables:


@@ -11,30 +18,33 @@ stages:
 before_script:
     - npm install
 
 before_script:
     - npm install
 

+cache:
+  key: ${CI_COMMIT_REF_SLUG}
+  paths:
+    - node_modules/
+    - .nyc_output/
+    - .sonar/cache
+

 lint:
 lint:

+  <<: *only-default

   stage: lint
   script:
     - npm run lint
 
 test:
   stage: lint
   script:
     - npm run lint
 
 test:

+  <<: *only-default

   stage: test
   script:
     - npm test
 
 quality:
   stage: test
   script:
     - npm test
 
 quality:

-  stage: "quality"
-  needs: ["test"]
+  <<: *only-default
+  stage: quality
+  needs:
+    - test

   image:
     name: sonarsource/sonar-scanner-cli:latest
     entrypoint: [""]
   image:
     name: sonarsource/sonar-scanner-cli:latest
     entrypoint: [""]

-  cache:
-    key: "${CI_JOB_NAME}"
-    paths:
-      - .sonar/cache

   script:
     - npm run coverage
     - sonar-scanner
   script:
     - npm run coverage
     - sonar-scanner

-  only:
-    - merge_requests
-    - master
-