Merge pull request #1981 from gittip/fix-travis

Sync travis setup with current Makefile.
gratipay · Feb 7, 2014 · 2244588 · 2244588
2 parents 22557e7 + aa52983
commit 2244588
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,12 +3,9 @@ before_install:
  - node --version
 install: make env node_modules
 before_script:
- - make local.env tests/env
- - echo "YES_PLEASE_DELETE_ALL_MY_DATA_VERY_OFTEN=Pretty please, with sugar on top." >> tests/env
- - echo "DATABASE_URL=dbname=gittip" | tee -a tests/env local.env
+ - echo "DATABASE_URL=dbname=gittip" | tee -a tests/local.env local.env
  - psql -U postgres -c 'CREATE DATABASE "gittip";'
- - make test-schema
-script: make test jstest
+script: make test
 notifications:
   email: false
   irc: