diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2015-09-03 10:55:43 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2015-09-22 12:04:34 +0300 |
commit | 01a93308b739a4031b76268b69e7bd0943d4c677 (patch) | |
tree | 4f55e49e549bfb72ebb29b11a7d57a46ccf644a1 /.travis.yml | |
parent | 7be1092dbc11d71998291cfd42f96994a441c8b7 (diff) |
refs #8689 started working on PHP 7 support
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index eef27e1d5e..3e8905be9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ language: php php: + - 7 - 5.6 - 5.3.3 # - hhvm @@ -43,6 +44,7 @@ matrix: fast_finish: true allow_failures: - php: hhvm + - php: 7 exclude: # Run test suites separately only on PHP 5.6 with PDO - php: 5.3.3 @@ -51,6 +53,8 @@ matrix: env: TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL - php: 5.3.3 env: TEST_SUITE=AllTests MYSQL_ADAPTER=PDO_MYSQL + - php: 7 + env: TEST_SUITE=AllTests MYSQL_ADAPTER=PDO_MYSQL - php: 5.3.3 env: TEST_SUITE=UnitTests MYSQL_ADAPTER=PDO_MYSQL - php: hhvm @@ -69,6 +73,8 @@ matrix: env: TEST_SUITE=AllTests MYSQL_ADAPTER=PDO_MYSQL - php: 5.3.3 env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI + - php: 7 + env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI - php: hhvm env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI # Javascript tests need to run only on one PHP version @@ -76,11 +82,15 @@ matrix: env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1 - php: hhvm env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1 + - php: 7 + env: TEST_SUITE=JavascriptTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1 # AngularJS tests need to run only on one PHP version - php: 5.3.3 env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1 - php: hhvm env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1 + - php: 7 + env: TEST_SUITE=AngularJSTests MYSQL_ADAPTER=PDO_MYSQL SKIP_COMPOSER_INSTALL=1 sudo: required @@ -93,8 +103,8 @@ before_install: install: - git fetch -q - - export GENERATE_TRAVIS_YML_COMMAND="php ./tests/travis/generator/main.php generate:travis-yml --core --verbose" - - '[[ "$TRAVIS_JOB_NUMBER" != *.1 || "$TRAVIS_PULL_REQUEST" != "false" ]] || ./tests/travis/autoupdate_travis_yml.sh' +# - export GENERATE_TRAVIS_YML_COMMAND="php ./tests/travis/generator/main.php generate:travis-yml --core --verbose" +# - '[[ "$TRAVIS_JOB_NUMBER" != *.1 || "$TRAVIS_PULL_REQUEST" != "false" ]] || ./tests/travis/autoupdate_travis_yml.sh' - '[ ! -f ./tests/travis/install_mysql_5.6.sh ] || ./tests/travis/install_mysql_5.6.sh' @@ -110,7 +120,7 @@ install: before_script: - - phpenv config-rm xdebug.ini; + - if [[ "$TRAVIS_PHP_VERSION" != 7* ]]; then phpenv config-rm xdebug.ini; fi # add always_populate_raw_post_data=-1 to php.ini - echo "always_populate_raw_post_data=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini |