diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-05-03 02:51:02 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-05-03 02:51:02 +0200 |
| commit | c29a72d17f8663abac4dcb1d4601778a9eeb3380 (patch) | |
| tree | 98aff4540d63d430446938ccb84850cefb644733 | |
| parent | 06a03bbfa60bedb3f30bb2908449fc30d54f848e (diff) | |
| parent | 58f4bf441a89bde7e91e3a8fdcd900cbc61df558 (diff) | |
| download | php-git-c29a72d17f8663abac4dcb1d4601778a9eeb3380.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 87a8695673..d59dd7012e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,6 @@ env: - REPORT_EXIT_STATUS=1 matrix: - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0 - - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=0 - - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=1 - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1 before_script: |