Merge branch 'rbdr-address-sonarqube-issues' into 'master'

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58231581cfecb14f11bf77d78ad4406d12090ea5..fe65211a62a42c21a38c40713b697f3fc3dd950b 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,10 +19,11 @@ before_script:
     - npm install
 
 cache:
     - npm install
 
 cache:

-  key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
+  key: ${CI_COMMIT_REF_SLUG}

   paths:
     - node_modules/
     - .nyc_output/
   paths:
     - node_modules/
     - .nyc_output/

+    - .sonar/cache

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


@@ -37,19 +38,13 @@ test:
     - npm test
 
 quality:
     - npm test
 
 quality:

+  <<: *only-default

   stage: quality
   needs:
     - test
   image:
     name: sonarsource/sonar-scanner-cli:latest
     entrypoint: [""]
   stage: quality
   needs:
     - test
   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