Skip to content

Commit e2b0a15

Browse files
authored
Add the grpc extension for the google spanner integration (#2944)
* Add grpc to the docker image Signed-off-by: Bob Weinand <[email protected]> * Don't enable grpc by default Signed-off-by: Bob Weinand <[email protected]> --------- Signed-off-by: Bob Weinand <[email protected]>
1 parent 49b3dc0 commit e2b0a15

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -1269,7 +1269,9 @@ test_integrations_frankenphp: global_test_run_dependencies
12691269
test_integrations_roadrunner: global_test_run_dependencies tests/Frameworks/Roadrunner/Version_2/composer.lock-php$(PHP_MAJOR_MINOR)
12701270
$(call run_tests_debug,tests/Integrations/Roadrunner/V2)
12711271
test_integrations_googlespanner: global_test_run_dependencies tests/Integrations/GoogleSpanner/composer.lock-php$(PHP_MAJOR_MINOR)
1272+
$(eval TEST_EXTRA_INI=-d extension=grpc.so)
12721273
$(call run_tests_debug,tests/Integrations/GoogleSpanner)
1274+
$(eval TEST_EXTRA_INI=)
12731275
test_integrations_sqlsrv: global_test_run_dependencies
12741276
$(eval TEST_EXTRA_INI=-d extension=sqlsrv.so)
12751277
$(call run_tests_debug,tests/Integrations/SQLSRV)

dockerfiles/ci/buster/build-extensions.sh

+6
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,12 @@ else
159159
popd
160160
fi
161161

162+
# ext-grpc is needed for google spanner
163+
if [[ $PHP_VERSION_ID -ge 80 ]]; then
164+
pecl install grpc;
165+
# avoid installing it by default, it seems to stall some testsuites.
166+
fi
167+
162168
# We don't install any redis.so to inis, but allow selection at runtime.
163169
if [[ $PHP_VERSION_ID -lt 80 ]]; then
164170
pecl install redis-3.1.6

0 commit comments

Comments
 (0)