diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-25 11:25:49 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-25 11:25:49 +0200 |
commit | 711e2a1216b4a2c68d52752906ca1f0e51832e01 (patch) | |
tree | bf30197c2ed44f3aee4fe27496d4ff9e76d003ab /.travis.yml | |
parent | c858d17f06179aa25f6e8aa06965313fd519d8e9 (diff) | |
parent | f07565b0ebdfc5b8210bbf58d994ebd319014e67 (diff) | |
download | php-git-711e2a1216b4a2c68d52752906ca1f0e51832e01.tar.gz |
Merge branch 'PHP-7.4'
* PHP-7.4:
Check class linking in VERIFY_RETURN_TYPE optimization
Simplify travis setup scripts
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index af2b7afb17..b25be33238 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,6 +51,7 @@ env: - PDO_MYSQL_TEST_USER=travis - PDO_MYSQL_TEST_PASS= - PDO_MYSQL_TEST_HOST=127.0.0.1 + - PDO_PGSQL_TEST_DSN="pgsql:host=localhost port=5432 dbname=test user=postgres password=" - REPORT_EXIT_STATUS=1 matrix: - ENABLE_ZTS=0 ENABLE_DEBUG=0 @@ -65,11 +66,8 @@ before_script: # Compile PHP - travis_wait ./travis/compile.sh # Setup Extensions - - . ./travis/ext/mysql/setup.sh - - . ./travis/ext/mysqli/setup.sh - - . ./travis/ext/pdo_mysql/setup.sh - - . ./travis/ext/pgsql/setup.sh - - . ./travis/ext/pdo_pgsql/setup.sh + - ./travis/setup-mysql.sh + - ./travis/setup-pgsql.sh # Run PHPs run-tests.php script: |