summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2017-03-24 06:17:24 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2017-03-24 06:17:24 +0000
commit8f6608af65563916897ebdda3c274270c969d604 (patch)
treebc402fab3907da5326acb5e6c15af9dc98cf2dc5 /.gitlab-ci.yml
parentf3fccaa35a9a024c82814a577f1b80571beda988 (diff)
parent9d951e5fd5ac78d050f76ab4e4e0159646336b57 (diff)
downloadgitlab-ce-8f6608af65563916897ebdda3c274270c969d604.tar.gz
Merge branch 'frontend-coverage-badge' into 'master'
Include JavaScript test coverage in coverage badge See merge request !10097
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24627b5faca..62468ad0f0e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -281,6 +281,7 @@ rake karma:
BABEL_ENV: "coverage"
script:
- bundle exec rake karma
+ coverage: '/^Statements *: (\d+\.\d+%)/'
artifacts:
name: coverage-javascript
expire_in: 31d
@@ -346,6 +347,7 @@ coverage:
USE_BUNDLE_INSTALL: "true"
script:
- bundle exec scripts/merge-simplecov
+ coverage: '/LOC \((\d+\.\d+%)\) covered.$/'
artifacts:
name: coverage
expire_in: 31d