aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-10-29 01:03:53 +0100
committerAndreas Fischer <bantu@phpbb.com>2013-10-29 01:03:53 +0100
commit5b6608312081624d9b46fce47183c2f65fd0361b (patch)
tree19443bc035860050f06a9073806814c533d153d0
parent92144b370c0a40ed037e5a6fa26445debe79c07a (diff)
downloadforums-5b6608312081624d9b46fce47183c2f65fd0361b.tar
forums-5b6608312081624d9b46fce47183c2f65fd0361b.tar.gz
forums-5b6608312081624d9b46fce47183c2f65fd0361b.tar.bz2
forums-5b6608312081624d9b46fce47183c2f65fd0361b.tar.xz
forums-5b6608312081624d9b46fce47183c2f65fd0361b.zip
[task/code-sniffer] Reorganise .travis.yml
PHPBB3-11980
-rw-r--r--.travis.yml12
1 files changed, 7 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index e82e815b3b..2a80b8ce0b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,16 +10,18 @@ env:
- DB=mysql
- DB=postgres
-before_script:
- - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi"
- - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi"
+install:
- sh -c "if [ '$DB' = 'mariadb' ]; then travis/setup-mariadb.sh; fi"
- - sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
+ - sh -c "if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` = "1" ]; then travis/setup-webserver.sh; fi"
- travis/install-php-extensions.sh
- cd phpBB
- php ../composer.phar install --dev --no-interaction --prefer-source
- cd ..
- - sh -c "if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` = "1" ]; then travis/setup-webserver.sh; fi"
+
+before_script:
+ - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi"
+ - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi"
+ - sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
script:
- cd build