diff options
| author | Kevin Lyda <kevin@ie.suberic.net> | 2014-01-05 13:53:08 +0000 |
|---|---|---|
| committer | Kevin Lyda <kevin@ie.suberic.net> | 2014-01-05 13:53:08 +0000 |
| commit | 284546b2e00639bfa5e965f6a846cf308752d58e (patch) | |
| tree | 7a9f96e99fa67b718527a768a0c545c63f5ccf2b /.travis.yml | |
| parent | dcaedb4a5e3dae774e0211935977cf4514e2a928 (diff) | |
| parent | d28ee0df124d79e9d0968c3325ae010b55d4a7b6 (diff) | |
| download | gitlab-ce-284546b2e00639bfa5e965f6a846cf308752d58e.tar.gz | |
Merge branch 'master' into logo-white-compress
Conflicts:
app/assets/images/logo-black.png
app/assets/images/logo-white.png
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index f0fc2fb8829..75b4c5c7030 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,14 @@ language: ruby env: - - DB=mysql TRAVIS=true + global: + - DB=mysql + - TRAVIS=true + matrix: + - TASK=spinach + - TASK=spec + - TASK=jasmine:ci before_install: - sudo apt-get install libicu-dev -y - - gem install charlock_holmes -v="0.6.9" branches: only: - 'master' @@ -11,8 +16,12 @@ rvm: - 2.0.0 services: - mysql - - postgresql + - redis-server before_script: - "cp config/database.yml.$DB config/database.yml" - "cp config/gitlab.yml.example config/gitlab.yml" -script: "bundle exec rake gitlab:test --trace" + - "bundle exec rake db:setup" + - "bundle exec rake db:seed_fu" +script: "bundle exec rake $TASK --trace" +notifications: + email: false |