summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-21 19:39:19 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-21 19:39:19 +0200
commitd68525ff97afb93523204953b1815f6ad35ae4cb (patch)
tree031792beae00abcc6e0b8e566d16b59c9f032dec
parent2e198cc3f104814e6b253a6e5832573f4784f571 (diff)
parent544ce2d06ac1b458252ee8c330fb43522b9184f6 (diff)
downloadgitlab-ce-d68525ff97afb93523204953b1815f6ad35ae4cb.tar.gz
Merge pull request #6369 from skv-headless/postrgesql_travis_testing
postgresql testing on travis
-rw-r--r--.travis.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 75b4c5c7030..b2449d4189e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,13 @@
language: ruby
env:
global:
- - DB=mysql
- TRAVIS=true
matrix:
- - TASK=spinach
- - TASK=spec
- - TASK=jasmine:ci
+ - TASK=spinach DB=mysql
+ - TASK=spec DB=mysql
+ - TASK=jasmine:ci DB=mysql
+ - TASK=spinach DB=postgresql
+ - TASK=spec DB=postgresql
before_install:
- sudo apt-get install libicu-dev -y
branches:
@@ -15,7 +16,6 @@ branches:
rvm:
- 2.0.0
services:
- - mysql
- redis-server
before_script:
- "cp config/database.yml.$DB config/database.yml"