Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use pre-existing homebrew state on CircleCI VMs #2608

Merged
merged 5 commits into from
Jul 22, 2021
Merged

Use pre-existing homebrew state on CircleCI VMs #2608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a17fb35
skip installing brew packages already set up on CircleCI Mac VMs
cce Jul 22, 2021
cc694b4
skip brew update / brew tap for CircleCI
cce Jul 22, 2021
1b48ff8
Add -x to configure_dev and only build mac temporarily
cce Jul 22, 2021
090f8d1
skip brew update / tap for CircleCI Mac VMs
cce Jul 22, 2021
a5bf5d2
Revert "Add -x to configure_dev and only build mac temporarily"
cce Jul 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions scripts/configure_dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,20 @@ if [ "${OS}" = "linux" ]; then
sudo "$SCRIPTPATH/install_linux_deps.sh"
fi
elif [ "${OS}" = "darwin" ]; then
brew update
brew tap homebrew/cask
if [ "${CIRCLECI}" != "true" ]; then
brew update
brew tap homebrew/cask
fi
install_or_upgrade pkg-config
install_or_upgrade boost
install_or_upgrade jq
install_or_upgrade libtool
install_or_upgrade autoconf
install_or_upgrade automake
install_or_upgrade shellcheck
install_or_upgrade python3
if [ "${CIRCLECI}" != "true" ]; then
install_or_upgrade jq
install_or_upgrade autoconf
install_or_upgrade automake
install_or_upgrade python3
fi
elif [ "${OS}" = "windows" ]; then
if ! $msys2 pacman -S --disable-download-timeout --noconfirm git automake autoconf m4 libtool make mingw-w64-x86_64-gcc mingw-w64-x86_64-boost mingw-w64-x86_64-python mingw-w64-x86_64-jq unzip procps; then
echo "Error installing pacman dependencies"
Expand Down
8 changes: 5 additions & 3 deletions scripts/travis/configure_dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ if [[ "${OS}" == "linux" ]]; then
elif [[ "${OS}" == "darwin" ]]; then
# we don't want to upgrade boost if we already have it, as it will try to update
# other components.
brew update
brew tap homebrew/cask
brew pin boost || true
if [ "${CIRCLECI}" != "true" ]; then
brew update
brew tap homebrew/cask
brew pin boost || true
fi
elif [[ "${OS}" == "windows" ]]; then
git config --global core.autocrlf true
# Golang probably is not installed under MSYS2 so add the environment variable temporarily
Expand Down