From 82ad71528366f894928593bf1b578938e6ab0ae1 Mon Sep 17 00:00:00 2001 From: Fred Cox Date: Mon, 16 Dec 2019 15:47:29 +0200 Subject: [PATCH 1/3] Add support for grpc and protobuf --- data/supported-extensions | 2 ++ install-php-extensions | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/data/supported-extensions b/data/supported-extensions index 7d51fde..827aa6c 100644 --- a/data/supported-extensions +++ b/data/supported-extensions @@ -10,6 +10,7 @@ exif 5.6 7.0 7.1 7.2 7.3 7.4 gd 5.6 7.0 7.1 7.2 7.3 7.4 gettext 5.6 7.0 7.1 7.2 7.3 7.4 gmp 5.6 7.0 7.1 7.2 7.3 7.4 +grpc 5.6 7.0 7.1 7.2 7.3 7.4 igbinary 5.6 7.0 7.1 7.2 7.3 7.4 imagick 5.6 7.0 7.1 7.2 7.3 7.4 imap 5.6 7.0 7.1 7.2 7.3 7.4 @@ -37,6 +38,7 @@ pdo_odbc 5.6 7.0 7.1 7.2 7.3 7.4 pdo_pgsql 5.6 7.0 7.1 7.2 7.3 7.4 pdo_sqlsrv 7.0 7.1 7.2 7.3 7.4 pgsql 5.6 7.0 7.1 7.2 7.3 7.4 +protobuf 5.6 7.0 7.1 7.2 7.3 7.4 pspell 5.6 7.0 7.1 7.2 7.3 7.4 pthreads 5.6 7.0 recode 5.6 7.0 7.1 7.2 7.3 diff --git a/install-php-extensions b/install-php-extensions index 32cb7cc..107a4d0 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -252,6 +252,12 @@ buildRequiredPackageLists () { gmp@debian) buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libgmp-dev" ;; + grpc@alpine) + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS zlib-dev" + ;; + grpc@debian) + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile zlib1g-dev" + ;; igbinary@alpine) buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS" ;; @@ -407,6 +413,9 @@ buildRequiredPackageLists () { buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libpq5" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libpq-dev" ;; + protobuf@alpine) + buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS" + ;; pspell@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent aspell-libs" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile aspell-dev" From 2b6379e66601fd3798c22efb1899d2734048b533 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Mon, 16 Dec 2019 17:04:01 +0100 Subject: [PATCH 2/3] Add required APK package for grpc on Alpine --- install-php-extensions | 1 + 1 file changed, 1 insertion(+) diff --git a/install-php-extensions b/install-php-extensions index 107a4d0..516b23d 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -253,6 +253,7 @@ buildRequiredPackageLists () { buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libgmp-dev" ;; grpc@alpine) + buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libstdc++" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS zlib-dev" ;; grpc@debian) From 277a7357c1554b359d163df8438b0b259c7f2f71 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Mon, 16 Dec 2019 17:19:10 +0100 Subject: [PATCH 3/3] Reduce TravisCI output size --- scripts/travisci-test-extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/travisci-test-extensions b/scripts/travisci-test-extensions index 38fc6ce..6bf85fb 100755 --- a/scripts/travisci-test-extensions +++ b/scripts/travisci-test-extensions @@ -75,7 +75,7 @@ testExtension () { return 0 fi printf ' - FAILED!\n' >&2 - cat "${testExtension_out}" >&2 + tail -n500 "${testExtension_out}" >&2 rm -rf "${testExtension_out}" return 1 }