Skip to content
Browse files

Fixed travis-ci setup

Revert "debug"

This reverts commit 81a9640.
  • Loading branch information...
1 parent 1efcab9 commit 81695980d43ca4000beb0e531f428a619b99b9e1 @willdurand willdurand committed
Showing with 1 addition and 29 deletions.
  1. +1 −5 .travis.yml
  2. +0 −24 tests/travisci
View
6 .travis.yml
@@ -5,12 +5,8 @@ env:
before_script:
- sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database test;'; fi"
- - pyrus channel-discover pear.phing.info
- - pyrus install phing/phing
- - phpenv rehash
- wget http://getcomposer.org/composer.phar
- php composer.phar install
- - php bin/propel test:prepare --vendor=mysql --dsn=mysql:dbname=test --user=root
- - tests/travisci
+ - php bin/propel test:prepare --vendor="$DB" --dsn="$DB:dbname=test" --user="root"
script: phpunit
View
24 tests/travisci
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT="/home/vagrant/builds/willdurand/Propel2"
-PROPEL_GEN="$CURRENT/tools/generator/bin/propel-gen"
-
-cd "$CURRENT/tests/Fixtures/bookstore"
-$PROPEL_GEN convert-conf
-$PROPEL_GEN insert-sql
-cd "$CURRENT"
-
-cd "$CURRENT/tests/Fixtures/bookstore-packaged"
-$PROPEL_GEN convert-conf
-$PROPEL_GEN insert-sql
-cd "$CURRENT"
-
-cd "$CURRENT/tests/Fixtures/namespaced"
-$PROPEL_GEN convert-conf
-$PROPEL_GEN insert-sql
-cd "$CURRENT"
-
-cd "$CURRENT/tests/Fixtures/schemas"
-$PROPEL_GEN convert-conf
-$PROPEL_GEN insert-sql
-cd "$CURRENT"

0 comments on commit 8169598

Please sign in to comment.
Something went wrong with that request. Please try again.