From fd80479b0dc06c5f95918c113f8a72e136155951 Mon Sep 17 00:00:00 2001
From: Peter Kieltyka <peter.kieltyka@pressly.com>
Date: Thu, 9 Jul 2015 17:16:50 -0600
Subject: [PATCH] Common Travis

---
 .travis.yml                | 6 +++---
 postgresql/_dumps/Makefile | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 00d6a641..d33cd356 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,9 @@ go:
 addons:
   postgresql: "9.4"
 
+services:
+  - mongodb
+
 env: GOARCH=amd64 TEST_HOST=127.0.0.1 UPPERIO_DB_DEBUG=1
 
 install:
@@ -33,9 +36,6 @@ install:
   - (cd $GOPATH/src/github.com/jmoiron/sqlx && go build -a && go install)
   - export TRAVIS_BUILD_DIR=$GOPATH/src/upper.io/db
 
-services:
-  - mongodb
-
 before_script:
   - mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql
 
diff --git a/postgresql/_dumps/Makefile b/postgresql/_dumps/Makefile
index 189977d9..7e1b30c1 100644
--- a/postgresql/_dumps/Makefile
+++ b/postgresql/_dumps/Makefile
@@ -6,7 +6,7 @@ DB_PASSWORD ?= upperio_secret
 DB_NAME     ?= upperio_tests
 
 setup:
-	psql -h$(TEST_HOST) -p$(TEST_PORT) < setup.sql
-	
+	psql -Upostgres -h$(TEST_HOST) -p$(TEST_PORT) < setup.sql
+
 reset-db:
 	cat structs.sql | PGPASSWORD="$(DB_PASSWORD)" psql -U$(DB_USERNAME) $(DB_NAME) -h$(TEST_HOST) -p$(TEST_PORT)
-- 
GitLab