summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-07-22 10:02:54 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-07-22 12:49:49 +0200
commitccbd77b2a712a4f70fdb1fb59ae8858e6a15f6e1 (patch)
treeb9e9cb5b1b7da25e6f35a552a1d49415d02f9cfb
parentf0f77252b851f0ecc14f51f06df595556b89e442 (diff)
downloadgitlab-ce-ccbd77b2a712a4f70fdb1fb59ae8858e6a15f6e1.tar.gz
Improve CI configuration file for pages stage
-rw-r--r--.gitlab-ci.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5305d9a26b..ea97a317931 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -192,14 +192,14 @@ spinach 9 10 ruby23: *spinach-knapsack-ruby23
# Other generic tests
-.static-analyses-variables: &static-analyses-variables
+.ruby-static-analysis: &ruby-static-analysis
variables:
SIMPLECOV: "false"
USE_DB: "false"
USE_BUNDLE_INSTALL: "true"
.exec: &exec
- <<: *static-analyses-variables
+ <<: *ruby-static-analysis
stage: test
script:
- bundle exec $CI_BUILD_NAME
@@ -226,7 +226,7 @@ teaspoon:
bundler:audit:
stage: test
- <<: *static-analyses-variables
+ <<: *ruby-static-analysis
only:
- master
script:
@@ -241,6 +241,7 @@ coverage:
script:
- bundle exec scripts/merge-simplecov
artifacts:
+ name: coverage
expire_in: 31d
paths:
- coverage/index.html
@@ -262,13 +263,12 @@ notify:slack:
pages:
before_script: []
- services: []
- variables: {}
stage: pages
dependencies:
- coverage
script:
- - mkdir -p public/coverage-ruby
+ - mv public/ .public/
+ - mkdir public/
- mv coverage public/coverage-ruby
artifacts:
paths: