From e1eb46ac0bc62f4d16135e2b042f8f59ab2e4eea Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 18 Sep 2024 14:24:34 -0400 Subject: [PATCH] CI: remove homebrew autoupdate deactivation from CircleCI (#6135) --- .circleci/config.yml | 4 ---- scripts/configure_dev.sh | 16 +++++++--------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 13d4ea996f..f9cd0660dd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,14 +49,10 @@ executors: macos: xcode: 14.2.0 resource_class: macos.m1.medium.gen1 - environment: - HOMEBREW_NO_AUTO_UPDATE: "true" mac_arm64_large: macos: xcode: 14.2.0 resource_class: macos.m1.large.gen1 - environment: - HOMEBREW_NO_AUTO_UPDATE: "true" slack-fail-stop-step: &slack-fail-post-step post-steps: diff --git a/scripts/configure_dev.sh b/scripts/configure_dev.sh index c7bd93a250..56edb84c32 100755 --- a/scripts/configure_dev.sh +++ b/scripts/configure_dev.sh @@ -78,15 +78,13 @@ if [ "${OS}" = "linux" ]; then sudo "$SCRIPTPATH/install_linux_deps.sh" fi elif [ "${OS}" = "darwin" ]; then - if [ "${CIRCLECI}" != "true" ]; then - brew update - brew_version=$(brew --version | head -1 | cut -d' ' -f2) - major_version=$(echo $brew_version | cut -d. -f1) - minor_version=$(echo $brew_version | cut -d. -f2) - version_decimal="$major_version.$minor_version" - if (($(echo "$version_decimal < 2.5" | bc -l))); then - brew tap homebrew/cask - fi + brew update + brew_version=$(brew --version | head -1 | cut -d' ' -f2) + major_version=$(echo $brew_version | cut -d. -f1) + minor_version=$(echo $brew_version | cut -d. -f2) + version_decimal="$major_version.$minor_version" + if (($(echo "$version_decimal < 2.5" | bc -l))); then + brew tap homebrew/cask fi install_or_upgrade pkg-config install_or_upgrade libtool