summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-06-03 20:00:26 +0000
committerValery Sizov <valery@gitlab.com>2015-06-03 20:00:26 +0000
commit9a75e91db9c9987363686de7c4d49e1616b46db2 (patch)
treefb3011580ad7fc87108bf2d587d8e6ec709a51f7
parent0e85179fa3bf1592864b391fc6ab8ae7c8bd068b (diff)
parent2f898ec18fefa651ce6832183a865025d2f6420f (diff)
downloadgitlab-ci-9a75e91db9c9987363686de7c4d49e1616b46db2.tar.gz
Merge branch 'fix_special_commands' into 'master'
Added .gitlab-ci.yml See merge request !120
-rw-r--r--.gitlab-ci.yml27
1 files changed, 16 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28fbc42..9f69dd9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,15 @@
jobs:
- script: |
export PATH=~/bin:/usr/local/bin:/usr/bin:/bin
+ export RAILS_ENV=test
ruby -v
- gem install bundler
+ gem install bundler --no-ri --no-rdoc
cp config/database.yml.mysql config/database.yml
cp config/application.yml.example config/application.yml
- ! 'sed "s/username\:.*$/username\: runner/" -i config/database.yml'
- ! 'sed "s/password\:.*$/password\: ''password''/" -i config/database.yml'
- bundle --without postgres
- RAILS_ENV=test bundle exec rake db:setup
+ sed "s/username\:.*$/username\: runner/" -i config/database.yml
+ sed "s/password\:.*$/password\: 'password'/" -i config/database.yml
+ bundle --without postgres --jobs $(($(nproc) + 1))
+ bundle exec rake db:setup
SIMPLECOV=true RAILS_ENV=test bundle exec rake spec
name: Specs
branches: true
@@ -17,16 +18,20 @@ jobs:
- script: |
export PATH=~/bin:/usr/local/bin:/usr/bin:/bin
ruby -v
- gem install bundler
- cp config/database.yml.mysql config/database.yml
- cp config/application.yml.example config/application.yml
- ! 'sed "s/username\:.*$/username\: runner/" -i config/database.yml'
- ! 'sed "s/password\:.*$/password\: ''password''/" -i config/database.yml'
+ gem install bundler
bundle --without postgres
bundle exec rubocop
name: Rubocop
branches: true
- tags: false
+ runner:
+- script: |
+ export PATH=~/bin:/usr/local/bin:/usr/bin:/bin
+ ruby -v
+ gem install bundler
+ bundle --without postgres
+ bundle exec brakeman
+ name: Brakeman
+ branches: true
runner:
deploy_jobs: []
skip_refs: ''