From: Michael Wallner Date: Wed, 29 Jul 2015 10:56:38 +0000 (+0200) Subject: now try something different X-Git-Tag: v0.6.0~19 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=f2b5f0a77cd3d7fbf5a4ba88320dcfbd03f02107;p=m6w6%2Fext-pq now try something different --- diff --git a/.travis.yml b/.travis.yml index ffc12f0..be7f250 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,6 @@ # autogenerated file; do not edit language: c -addons: - apt: - packages: - - libpq-dev - env: global: - BUILD_SRC_DIR=/src @@ -17,161 +12,87 @@ env: matrix: include: - - env: PHP_TARGET_REF="PHP-5.4" PHP_CONFIGURE_OPTS="" - addons: - postgresql: 9.1 - env: PHP_TARGET_REF="PHP-5.4" PHP_CONFIGURE_OPTS="" addons: postgresql: 9.2 - - env: PHP_TARGET_REF="PHP-5.4" PHP_CONFIGURE_OPTS="" - addons: - postgresql: 9.3 - - env: PHP_TARGET_REF="PHP-5.4" PHP_CONFIGURE_OPTS="" - addons: - postgresql: 9.4 - - env: PHP_TARGET_REF="PHP-5.4" PHP_CONFIGURE_OPTS="--enable-debug" - addons: - postgresql: 9.1 + apt: + packages: + - libpq-dev-9.2 - env: PHP_TARGET_REF="PHP-5.4" PHP_CONFIGURE_OPTS="--enable-debug" addons: postgresql: 9.2 - - env: PHP_TARGET_REF="PHP-5.4" PHP_CONFIGURE_OPTS="--enable-debug" - addons: - postgresql: 9.3 - - env: PHP_TARGET_REF="PHP-5.4" PHP_CONFIGURE_OPTS="--enable-debug" - addons: - postgresql: 9.4 - - env: PHP_TARGET_REF="PHP-5.4" PHP_CONFIGURE_OPTS="--enable-maintainer-zts" - addons: - postgresql: 9.1 + apt: + packages: + - libpq-dev-9.2 - env: PHP_TARGET_REF="PHP-5.4" PHP_CONFIGURE_OPTS="--enable-maintainer-zts" addons: postgresql: 9.2 - - env: PHP_TARGET_REF="PHP-5.4" PHP_CONFIGURE_OPTS="--enable-maintainer-zts" - addons: - postgresql: 9.3 - - env: PHP_TARGET_REF="PHP-5.4" PHP_CONFIGURE_OPTS="--enable-maintainer-zts" - addons: - postgresql: 9.4 - - env: PHP_TARGET_REF="PHP-5.4" PHP_CONFIGURE_OPTS="--enable-debug --enable-maintainer-zts" - addons: - postgresql: 9.1 + apt: + packages: + - libpq-dev-9.2 - env: PHP_TARGET_REF="PHP-5.4" PHP_CONFIGURE_OPTS="--enable-debug --enable-maintainer-zts" addons: postgresql: 9.2 - - env: PHP_TARGET_REF="PHP-5.4" PHP_CONFIGURE_OPTS="--enable-debug --enable-maintainer-zts" - addons: - postgresql: 9.3 - - env: PHP_TARGET_REF="PHP-5.4" PHP_CONFIGURE_OPTS="--enable-debug --enable-maintainer-zts" - addons: - postgresql: 9.4 - - env: PHP_TARGET_REF="PHP-5.5" PHP_CONFIGURE_OPTS="" - addons: - postgresql: 9.1 + apt: + packages: + - libpq-dev-9.2 - env: PHP_TARGET_REF="PHP-5.5" PHP_CONFIGURE_OPTS="" addons: postgresql: 9.2 - - env: PHP_TARGET_REF="PHP-5.5" PHP_CONFIGURE_OPTS="" - addons: - postgresql: 9.3 - - env: PHP_TARGET_REF="PHP-5.5" PHP_CONFIGURE_OPTS="" - addons: - postgresql: 9.4 - - env: PHP_TARGET_REF="PHP-5.5" PHP_CONFIGURE_OPTS="--enable-debug" - addons: - postgresql: 9.1 + apt: + packages: + - libpq-dev-9.2 - env: PHP_TARGET_REF="PHP-5.5" PHP_CONFIGURE_OPTS="--enable-debug" addons: postgresql: 9.2 - - env: PHP_TARGET_REF="PHP-5.5" PHP_CONFIGURE_OPTS="--enable-debug" - addons: - postgresql: 9.3 - - env: PHP_TARGET_REF="PHP-5.5" PHP_CONFIGURE_OPTS="--enable-debug" - addons: - postgresql: 9.4 - - env: PHP_TARGET_REF="PHP-5.5" PHP_CONFIGURE_OPTS="--enable-maintainer-zts" - addons: - postgresql: 9.1 + apt: + packages: + - libpq-dev-9.2 - env: PHP_TARGET_REF="PHP-5.5" PHP_CONFIGURE_OPTS="--enable-maintainer-zts" addons: postgresql: 9.2 - - env: PHP_TARGET_REF="PHP-5.5" PHP_CONFIGURE_OPTS="--enable-maintainer-zts" - addons: - postgresql: 9.3 - - env: PHP_TARGET_REF="PHP-5.5" PHP_CONFIGURE_OPTS="--enable-maintainer-zts" - addons: - postgresql: 9.4 - - env: PHP_TARGET_REF="PHP-5.5" PHP_CONFIGURE_OPTS="--enable-debug --enable-maintainer-zts" - addons: - postgresql: 9.1 + apt: + packages: + - libpq-dev-9.2 - env: PHP_TARGET_REF="PHP-5.5" PHP_CONFIGURE_OPTS="--enable-debug --enable-maintainer-zts" addons: postgresql: 9.2 - - env: PHP_TARGET_REF="PHP-5.5" PHP_CONFIGURE_OPTS="--enable-debug --enable-maintainer-zts" - addons: - postgresql: 9.3 - - env: PHP_TARGET_REF="PHP-5.5" PHP_CONFIGURE_OPTS="--enable-debug --enable-maintainer-zts" - addons: - postgresql: 9.4 - - env: PHP_TARGET_REF="PHP-5.6" PHP_CONFIGURE_OPTS="" - addons: - postgresql: 9.1 + apt: + packages: + - libpq-dev-9.2 - env: PHP_TARGET_REF="PHP-5.6" PHP_CONFIGURE_OPTS="" addons: postgresql: 9.2 - - env: PHP_TARGET_REF="PHP-5.6" PHP_CONFIGURE_OPTS="" - addons: - postgresql: 9.3 - - env: PHP_TARGET_REF="PHP-5.6" PHP_CONFIGURE_OPTS="" - addons: - postgresql: 9.4 - - env: PHP_TARGET_REF="PHP-5.6" PHP_CONFIGURE_OPTS="--enable-debug" - addons: - postgresql: 9.1 + apt: + packages: + - libpq-dev-9.2 - env: PHP_TARGET_REF="PHP-5.6" PHP_CONFIGURE_OPTS="--enable-debug" addons: postgresql: 9.2 - - env: PHP_TARGET_REF="PHP-5.6" PHP_CONFIGURE_OPTS="--enable-debug" - addons: - postgresql: 9.3 - - env: PHP_TARGET_REF="PHP-5.6" PHP_CONFIGURE_OPTS="--enable-debug" - addons: - postgresql: 9.4 - - env: PHP_TARGET_REF="PHP-5.6" PHP_CONFIGURE_OPTS="--enable-maintainer-zts" - addons: - postgresql: 9.1 + apt: + packages: + - libpq-dev-9.2 - env: PHP_TARGET_REF="PHP-5.6" PHP_CONFIGURE_OPTS="--enable-maintainer-zts" addons: postgresql: 9.2 - - env: PHP_TARGET_REF="PHP-5.6" PHP_CONFIGURE_OPTS="--enable-maintainer-zts" - addons: - postgresql: 9.3 - - env: PHP_TARGET_REF="PHP-5.6" PHP_CONFIGURE_OPTS="--enable-maintainer-zts" - addons: - postgresql: 9.4 - - env: PHP_TARGET_REF="PHP-5.6" PHP_CONFIGURE_OPTS="--enable-debug --enable-maintainer-zts" - addons: - postgresql: 9.1 + apt: + packages: + - libpq-dev-9.2 - env: PHP_TARGET_REF="PHP-5.6" PHP_CONFIGURE_OPTS="--enable-debug --enable-maintainer-zts" addons: postgresql: 9.2 - - env: PHP_TARGET_REF="PHP-5.6" PHP_CONFIGURE_OPTS="--enable-debug --enable-maintainer-zts" - addons: - postgresql: 9.3 - - env: PHP_TARGET_REF="PHP-5.6" PHP_CONFIGURE_OPTS="--enable-debug --enable-maintainer-zts" - addons: - postgresql: 9.4 + apt: + packages: + - libpq-dev-9.2 before_script: - ./travis/compile-php.sh - ./travis/compile-ext-raphf.sh - ./travis/compile-ext-pq.sh - ./travis/configure-postgres.sh + - $HOME$BUILD_INSTALL_DIR/bin/php --ri pq script: - - pg_config --version - - psql --version - - $HOME$BUILD_INSTALL_DIR/bin/php --ri pq - $HOME$BUILD_INSTALL_DIR/bin/php ./run-tests.php -q -p $HOME$BUILD_INSTALL_DIR/bin/php --show-diff sudo: false