diff --git a/README.md b/README.md index 764491a..2d04c1a 100644 --- a/README.md +++ b/README.md @@ -150,6 +150,14 @@ Some extension has special requirements: Test: gd, zip ``` + If your pull request contains multiple commits, we'll check the "Test:" message of every commit. + If you want to stop parsing next commits, add `-STOP-` in the "Test:" line, for example: + ``` + Improve the GD and ZIP extensions + + Test: gd, zip, -STOP- + ``` + ## Do you want to really say thank you? diff --git a/data/supported-extensions b/data/supported-extensions index 301f230..8d24e12 100644 --- a/data/supported-extensions +++ b/data/supported-extensions @@ -20,6 +20,7 @@ mcrypt 5.6 7.0 7.1 7.2 7.3 7.4 memcache 5.6 memcached 5.6 7.0 7.1 7.2 7.3 7.4 msgpack 5.6 7.0 7.1 7.2 7.3 7.4 +mssql 5.6 mysql 5.6 mysqli 5.6 7.0 7.1 7.2 7.3 7.4 odbc 5.6 7.0 7.1 7.2 7.3 7.4 diff --git a/install-php-extensions b/install-php-extensions index 22b106f..eac0799 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -296,7 +296,7 @@ buildRequiredPackageLists () { buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libldap2-dev" ;; mcrypt@alpine) - buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libmcrypt" + buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent $PHPIZE_DEPS libmcrypt" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libmcrypt-dev" ;; mcrypt@debian) @@ -320,7 +320,12 @@ buildRequiredPackageLists () { msgpack@alpine) buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS" ;; + mssql@alpine) + buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent freetds" + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile freetds-dev" + ;; mssql@debian) + buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libsybdb5" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile freetds-dev" ;; odbc@debian) @@ -527,9 +532,8 @@ installBundledModule () { cd /tmp/src/firebird #Patch rwlock.h (this has been fixed in later release of firebird 3.x) sed -i '194s/.*/#if 0/' src/common/classes/rwlock.h - set +x ./configure --with-system-icu - make -j$(nproc) btyacc_binary gpre_boot libfbstatic libfbclient + make -s btyacc_binary gpre_boot libfbstatic libfbclient cp gen/firebird/lib/libfbclient.so /usr/lib/ ln -s /usr/lib/libfbclient.so /usr/lib/libfbclient.so.2 cd - diff --git a/scripts/travisci-test-extensions b/scripts/travisci-test-extensions index ec76f36..38fc6ce 100755 --- a/scripts/travisci-test-extensions +++ b/scripts/travisci-test-extensions @@ -156,6 +156,9 @@ getAllPHPVersionsFor () { # Arguments: # $1: the commit hash # +# Set: +# STOP_NEXT_COMMITS to 1 if we should skip next commits +# # Return: # 0 (true): if test passes # 1 (false): if test fails @@ -186,7 +189,9 @@ testExtensionsFromMessage () { if test -n "$TESTLIST"; then IFS=' ,;' for COMMIT_LINE_EXT in $TESTLIST; do - if test -z "$TEST_EXTENSIONS"; then + if test $COMMIT_LINE_EXT = '-STOP-'; then + STOP_NEXT_COMMITS=1 + elif test -z "$TEST_EXTENSIONS"; then TEST_EXTENSIONS=$COMMIT_LINE_EXT; else if ! stringInList "$COMMIT_LINE_EXT" "$TEST_EXTENSIONS"; then @@ -210,7 +215,7 @@ testExtensionsFromMessage () { return $testExtensionsFromMessage_result } - +STOP_NEXT_COMMITS=0 TESTS_RESULTS=0 ADDED_EXTENSION_LINE= FOUND_ATAT= @@ -239,6 +244,9 @@ for COMMIT_HASH in $(git -C "${TRAVIS_BUILD_DIR}" log --pretty='format:%H' "${TR if ! testExtensionsFromMessage "$COMMIT_HASH"; then TESTS_RESULTS=1 fi + if test $STOP_NEXT_COMMITS -eq 1; then + break + fi done if test ${TESTS_RESULTS} -ne 0; then