Update CHANGELOG and package.json

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c94c32ce4d3c4c17be6ffb52e19137dc15fa8c5..fe65211a62a42c21a38c40713b697f3fc3dd950b 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,13 @@ stages:
 before_script:
     - npm install
 
 before_script:
     - npm install
 

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

 lint:
   <<: *only-default
   stage: lint
 lint:
   <<: *only-default
   stage: lint


@@ -31,18 +38,13 @@ test:
     - npm test
 
 quality:
     - 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