diff --git a/.travis.yml b/.travis.yml index 00d6a6415f7ff1d6cf5f77f5def5e160cd53c434..d33cd356ad099f4d00fa18d091b4e167e0731a63 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 189977d9ae8ea63d53ae894959eb6e1a7a1fe3eb..7e1b30c1a66625e1912707c02a601e0dbd8e7cc2 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)