From 9c12e2465642e4151a587f73f957e8f0b64bb10a Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Tue, 2 Oct 2012 14:13:26 +0200 Subject: [PATCH] Update test environment --- .travis.yml | 4 +++- build-env.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6f24660c1d..af9edd99c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,9 @@ services: - mysql before_script: - - cp hudson/*.yml config/ + - rm -f config/services.yml config/connexions.yml config/config.yml config/config.inc config/connexion.inc config/_GV.php config/_GV.php.old + - cp -f hudson/connexion.inc config/ + - cp -f hudson/_GV.php config/ - curl -s http://getcomposer.org/installer | php - php composer.phar install --dev - sudo apt-get update diff --git a/build-env.sh b/build-env.sh index 953c436a7d..0111309115 100755 --- a/build-env.sh +++ b/build-env.sh @@ -1,4 +1,6 @@ -cp -f hudson/*.yml config/ +rm -f config/services.yml config/connexions.yml config/config.yml config/config.inc config/connexion.inc config/_GV.php config/_GV.php.old +cp -f hudson/connexion.inc config/ +cp -f hudson/_GV.php config/ curl -s http://getcomposer.org/installer | php php composer.phar install --dev sudo mysql -e 'drop database ab_test;drop database db_test; drop database ab_unitTests; drop database db_unitTests;'