Fixing mac php tests (#10523)

* Manually run brew cleanup and initialize php * Add debug loggin for visibility * Allow underscores in php folder name * Add logging to php tests * Add tracing * Only use the latest installation of php
protocolbuffers · Sep 9, 2022 · 687fbff · 687fbff
1 parent 4efbcc4
commit 687fbff
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/kokoro/macos/php74/build.sh b/kokoro/macos/php74/build.sh
@@ -9,10 +9,11 @@ cd $(dirname $0)/../../..
 source kokoro/macos/prepare_build_macos_rc
 
 # Install Dependencies
+brew cleanup
 brew install coreutils [email protected]
 
 # Configure path
-PHP_FOLDER=$(find $HOMEBREW_PREFIX -type d -regex ".*php.*/7.4.[0-9]*")
+PHP_FOLDER=$(find $HOMEBREW_PREFIX -type d -regex ".*php.*/7.4.[0-9_.]*" | sort -n | tail -n 1)
 test ! -z "$PHP_FOLDER"
 export PATH="$PHP_FOLDER/bin:$PATH"
 

diff --git a/kokoro/macos/php80/build.sh b/kokoro/macos/php80/build.sh
@@ -9,10 +9,11 @@ cd $(dirname $0)/../../..
 source kokoro/macos/prepare_build_macos_rc
 
 # Install Dependencies
+brew cleanup
 brew install coreutils [email protected]
 
 # Configure path
-PHP_FOLDER=$(find $HOMEBREW_PREFIX -type d -regex ".*php.*/8.0.[0-9]*")
+PHP_FOLDER=$(find $HOMEBREW_PREFIX -type d -regex ".*php.*/8.0.[0-9_.]*" | sort -n | tail -n 1)
 test ! -z "$PHP_FOLDER"
 export PATH="$PHP_FOLDER/bin:$PATH"
 

diff --git a/php/tests/compile_extension.sh b/php/tests/compile_extension.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 cd $(dirname $0)/..