diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-09-29 17:45:43 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-09-29 17:45:43 +0300 |
| commit | 267e8c73f2533942b7d112f1b827131fd4bbad72 (patch) | |
| tree | 059af2629cb9baf337f260c2f625e70fa3d13c06 | |
| parent | 9da1928faae709f958504451a724d1d555421573 (diff) | |
| download | gitlab-ce-267e8c73f2533942b7d112f1b827131fd4bbad72.tar.gz | |
Use gitlab:test for travis-ci
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | lib/tasks/travis.rake | 5 |
2 files changed, 1 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 3ed3dec1425..f0fc2fb8829 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,4 @@ services: before_script: - "cp config/database.yml.$DB config/database.yml" - "cp config/gitlab.yml.example config/gitlab.yml" - - "bundle exec rake db:setup RAILS_ENV=test" - - "bundle exec rake db:seed_fu RAILS_ENV=test" - - "sh -e /etc/init.d/xvfb start" -script: "bundle exec rake travis --trace" +script: "bundle exec rake gitlab:test --trace" diff --git a/lib/tasks/travis.rake b/lib/tasks/travis.rake deleted file mode 100644 index bc1b8aadbc5..00000000000 --- a/lib/tasks/travis.rake +++ /dev/null @@ -1,5 +0,0 @@ -desc "Travis run tests" -task travis: [ - :spinach, - :spec -] |