From ab771c8f754954ad94a1bc24d2e9819fd285c0da Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Thu, 17 Sep 2015 16:27:25 -0400
Subject: Adding go 1.5.1 and postgress to travis build

---
 .travis.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 877977dd4..02e1234d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,10 @@
 language: go
 go:
 - 1.4.2
+- 1.5.1
+env:
+- TRAVIS_DB=mysql
+- TRAVIS_DB=postgres
 before_install:
 - gem install compass
 - sudo apt-get update -qq
@@ -24,6 +28,9 @@ before_script:
 - mysql -e "CREATE DATABASE IF NOT EXISTS mattermost_test ;" -uroot
 - mysql -e "CREATE USER 'mmuser'@'%' IDENTIFIED BY 'mostest' ;"  -uroot
 - mysql -e "GRANT ALL ON mattermost_test.* TO 'mmuser'@'%' ;" -uroot
+- psql -c "create database mattermost_test ;" -U postgres
+- psql -c "create user mmuser with password 'mostest' ;" -U postgres
+- psql -c 'grant all privileges on database "mattermost_test" to mmuser ;' -U postgres
 services:
 - redis-server
 addons:
@@ -38,6 +45,8 @@ deploy:
    on:
      repo: mattermost/platform
      tags: true
+     go: 1.4.2
+     condition: $TRAVIS_DB = mysql
 
  - provider: s3
    access_key_id: AKIAJCO3KJYEGWJIKDIQ
@@ -52,3 +61,5 @@ deploy:
    on:
      repo: mattermost/platform
      branch: master
+     go: 1.4.2
+     condition: $TRAVIS_DB = mysql
-- 
cgit v1.2.3-1-g7c22