summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-15 18:41:09 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-15 18:41:09 +0200
commitddd04dec93e8d006d1d8f9a9708bf07d0443bd48 (patch)
tree11a5166ab1b3a44cc7a36590ac27a1f6bdeb6c82
parentb27ef0831898c22a2a630afb15822d3208990d07 (diff)
downloadgitlab-ce-ddd04dec93e8d006d1d8f9a9708bf07d0443bd48.tar.gz
Fix .gitlab-ci.yml file
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--.gitlab-ci.yml62
1 files changed, 37 insertions, 25 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1411a9194b5..7a33061e474 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,4 @@
+# This file is generated by GitLab CI
before_script:
- export PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin
- ruby -v
@@ -7,33 +8,44 @@ before_script:
- echo $PATH
- cp config/database.yml.mysql config/database.yml
- cp config/gitlab.yml.example config/gitlab.yml
- - ! 'sed "s/username\:.*$/username\: runner/" -i config/database.yml'
- - ! 'sed "s/password\:.*$/password\: ''password''/" -i config/database.yml'
+ - 'sed "s/username\:.*$/username\: runner/" -i config/database.yml'
+ - 'sed "s/password\:.*$/password\: ''password''/" -i config/database.yml'
- sed "s/gitlabhq_test/gitlabhq_test_$((RANDOM/5000))/" -i config/database.yml
- touch log/application.log
- touch log/test.log
- bundle install --without postgres production --jobs $(nproc)
- bundle exec rake db:create RAILS_ENV=test
-jobs:
-- script:
- - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec
- name: Rspec
- runner: ruby,mysql
-- script:
- - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach
- name: Spinach
- runner: ruby,mysql
-- script:
- - RAILS_ENV=test SIMPLECOV=true bundle exec rake jasmine:ci
- name: Jasmine
- runner: ruby,mysql
-- script:
- - bundle exec rubocop
- name: Rubocop
- runner: ruby,mysql
-- script:
- - bundle exec rake brakeman
- name: Brakeman
- runner: ruby,mysql
-deploy_jobs: []
-skip_refs: ''
+Rspec:
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec
+ tags:
+ - ruby
+ - mysql
+
+Spinach:
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach
+ tags:
+ - ruby
+ - mysql
+
+Jasmine:
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake jasmine:ci
+ tags:
+ - ruby
+ - mysql
+
+Rubocop:
+ script:
+ - bundle exec rubocop
+ tags:
+ - ruby
+ - mysql
+
+Brakeman:
+ script:
+ - bundle exec rake brakeman
+ tags:
+ - ruby
+ - mysql