summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorNihad Abbasov <narkoz.2008@gmail.com>2012-05-29 02:38:15 +0500
committerNihad Abbasov <narkoz.2008@gmail.com>2012-05-29 02:38:15 +0500
commite4d47d30de823c52e7f565cd2007918bb2858479 (patch)
tree3a486cb23071e3ca16b1a8a9fab93fb01e094442 /.travis.yml
parent632415567f269a230f2ecd25c18f4639dccf3a7e (diff)
downloadgitlab-ce-e4d47d30de823c52e7f565cd2007918bb2858479.tar.gz
fix travis issues and run build against ruby 1.9.3
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index f1ea16d8519..0c03e38993d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,15 @@
env:
- DB=mysql
- DB=sqlite
-before_install: sudo apt-get install libicu-dev -y
+before_install:
+ - sudo apt-get install libicu-dev -y
+ - echo "yes" | gem uninstall json ffi
branches:
only:
- 'master'
rvm:
- 1.9.2
+ - 1.9.3
before_script:
- "cp config/database.yml.$DB config/database.yml"
- "cp config/gitlab.yml.example config/gitlab.yml"