From 7e6c9844a21f45e55abec57366513db545473876 Mon Sep 17 00:00:00 2001 From: deannagarcia <69992229+deannagarcia@users.noreply.github.com> Date: Tue, 29 Nov 2022 13:52:54 -0800 Subject: [PATCH 1/2] Prohibit homebrew from automatically updating packages When homebrew automatically updates packages we have less control over what version of packages we are running, this will make the script more deterministic. In addition, it will fix errors relating to updating irrelevant packages. --- kokoro/macos/prepare_build_macos_rc | 1 + 1 file changed, 1 insertion(+) diff --git a/kokoro/macos/prepare_build_macos_rc b/kokoro/macos/prepare_build_macos_rc index d8b1395164..7156d58b32 100755 --- a/kokoro/macos/prepare_build_macos_rc +++ b/kokoro/macos/prepare_build_macos_rc @@ -5,6 +5,7 @@ set -eux export HOMEBREW_PREFIX=$(brew --prefix) +export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 # Do not automatically update packages. ## # Select Xcode version From 4465c092cf3e7bea247a278ee4d0069a07b2535e Mon Sep 17 00:00:00 2001 From: deannagarcia <69992229+deannagarcia@users.noreply.github.com> Date: Tue, 29 Nov 2022 14:57:58 -0800 Subject: [PATCH 2/2] Remove php 7.4 installation --- kokoro/macos/php74/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kokoro/macos/php74/build.sh b/kokoro/macos/php74/build.sh index 2ad4eab598..f0444347ef 100755 --- a/kokoro/macos/php74/build.sh +++ b/kokoro/macos/php74/build.sh @@ -9,8 +9,9 @@ cd $(dirname $0)/../../.. source kokoro/macos/prepare_build_macos_rc # Install Dependencies +# PHP 7.4 is already installed on the machine brew cleanup -brew install coreutils php@7.4 +brew install coreutils # Configure path PHP_FOLDER=$(find $HOMEBREW_PREFIX -type d -regex ".*php.*/7.4.[0-9_.]*" | sort -n | tail -n 1)