From e2b0a15abbf03bc042f4fdd732e36fde8cdf0fd3 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Wed, 13 Nov 2024 13:59:35 +0100 Subject: [PATCH] Add the grpc extension for the google spanner integration (#2944) * Add grpc to the docker image Signed-off-by: Bob Weinand * Don't enable grpc by default Signed-off-by: Bob Weinand --------- Signed-off-by: Bob Weinand --- Makefile | 2 ++ dockerfiles/ci/buster/build-extensions.sh | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/Makefile b/Makefile index 85e20f0fd3..ab10335e0f 100644 --- a/Makefile +++ b/Makefile @@ -1269,7 +1269,9 @@ test_integrations_frankenphp: global_test_run_dependencies test_integrations_roadrunner: global_test_run_dependencies tests/Frameworks/Roadrunner/Version_2/composer.lock-php$(PHP_MAJOR_MINOR) $(call run_tests_debug,tests/Integrations/Roadrunner/V2) test_integrations_googlespanner: global_test_run_dependencies tests/Integrations/GoogleSpanner/composer.lock-php$(PHP_MAJOR_MINOR) + $(eval TEST_EXTRA_INI=-d extension=grpc.so) $(call run_tests_debug,tests/Integrations/GoogleSpanner) + $(eval TEST_EXTRA_INI=) test_integrations_sqlsrv: global_test_run_dependencies $(eval TEST_EXTRA_INI=-d extension=sqlsrv.so) $(call run_tests_debug,tests/Integrations/SQLSRV) diff --git a/dockerfiles/ci/buster/build-extensions.sh b/dockerfiles/ci/buster/build-extensions.sh index 710df2930e..1891f93358 100755 --- a/dockerfiles/ci/buster/build-extensions.sh +++ b/dockerfiles/ci/buster/build-extensions.sh @@ -159,6 +159,12 @@ else popd fi + # ext-grpc is needed for google spanner + if [[ $PHP_VERSION_ID -ge 80 ]]; then + pecl install grpc; + # avoid installing it by default, it seems to stall some testsuites. + fi + # We don't install any redis.so to inis, but allow selection at runtime. if [[ $PHP_VERSION_ID -lt 80 ]]; then pecl install redis-3.1.6