Skip to content

Commit

Permalink
CI: remove homebrew autoupdate deactivation from CircleCI (#6135)
Browse files Browse the repository at this point in the history
  • Loading branch information
onetechnical authored Sep 18, 2024
1 parent 619d257 commit e1eb46a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
4 changes: 0 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
16 changes: 7 additions & 9 deletions scripts/configure_dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e1eb46a

Please sign in to comment.