Skip to content

Commit c44aba5

Browse files
committed
CI: remove homebrew autoupdate deactivation from CircleCI (#6135)
1 parent 49d4765 commit c44aba5

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

.circleci/config.yml

-4
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,10 @@ executors:
4949
macos:
5050
xcode: 14.2.0
5151
resource_class: macos.m1.medium.gen1
52-
environment:
53-
HOMEBREW_NO_AUTO_UPDATE: "true"
5452
mac_arm64_large:
5553
macos:
5654
xcode: 14.2.0
5755
resource_class: macos.m1.large.gen1
58-
environment:
59-
HOMEBREW_NO_AUTO_UPDATE: "true"
6056

6157
slack-fail-stop-step: &slack-fail-post-step
6258
post-steps:

scripts/configure_dev.sh

+7-9
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,13 @@ if [ "${OS}" = "linux" ]; then
7878
sudo "$SCRIPTPATH/install_linux_deps.sh"
7979
fi
8080
elif [ "${OS}" = "darwin" ]; then
81-
if [ "${CIRCLECI}" != "true" ]; then
82-
brew update
83-
brew_version=$(brew --version | head -1 | cut -d' ' -f2)
84-
major_version=$(echo $brew_version | cut -d. -f1)
85-
minor_version=$(echo $brew_version | cut -d. -f2)
86-
version_decimal="$major_version.$minor_version"
87-
if (($(echo "$version_decimal < 2.5" | bc -l))); then
88-
brew tap homebrew/cask
89-
fi
81+
brew update
82+
brew_version=$(brew --version | head -1 | cut -d' ' -f2)
83+
major_version=$(echo $brew_version | cut -d. -f1)
84+
minor_version=$(echo $brew_version | cut -d. -f2)
85+
version_decimal="$major_version.$minor_version"
86+
if (($(echo "$version_decimal < 2.5" | bc -l))); then
87+
brew tap homebrew/cask
9088
fi
9189
install_or_upgrade pkg-config
9290
install_or_upgrade libtool

0 commit comments

Comments
 (0)