Tarantool development patches archive
 help / color / mirror / Atom feed
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
To: Alexander Turenko <alexander.turenko@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v3 1/2] build: tune OSX environment
Date: Wed, 18 Dec 2019 09:11:11 +0300	[thread overview]
Message-ID: <eea51e57f329de141f01e2bb3afa77b6be729ca5.1576648181.git.avtikhon@tarantool.org> (raw)
In-Reply-To: <cover.1576648181.git.avtikhon@tarantool.org>
In-Reply-To: <cover.1576648181.git.avtikhon@tarantool.org>

Added homebrew installation routine as it was suggested in its
instructions. Added installation of the cmake tool. Added upgrade
of the OSX packages to avoid of fails on already existed packages
with the previous versions.
---
 .travis.mk | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/.travis.mk b/.travis.mk
index 42969ff56..35d9a4f7e 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -127,17 +127,31 @@ test_asan_debian: deps_debian deps_buster_clang_8 test_asan_debian_no_deps
 # OSX #
 #######
 
+OSX_PKGS=openssl readline curl icu4c libiconv zlib autoconf automake libtool cmake
+
 deps_osx:
-	brew update
-	brew install openssl readline curl icu4c libiconv zlib autoconf automake libtool --force
+	# install brew using command from Homebrew repository instructions:
+	#   https://github.com/Homebrew/install
+	# NOTE: 'echo' command below is required since brew installation
+	# script obliges the one to enter a newline for confirming the
+	# installation via Ruby script.
+	export PATH=${PATH}:/usr/local/bin ; \
+		brew update || echo | /usr/bin/ruby -e \
+			"$$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+	# try to install the packages either upgrade it to avoid of fails
+	# if the package already exists with the previous version
+	export PATH=${PATH}:/usr/local/bin ; \
+		brew install --force ${OSX_PKGS} || brew upgrade ${OSX_PKGS}
 	python2 -V || brew install python2 --force
 	curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py >get-pip.py
 	python get-pip.py --user
 	pip install --user --force-reinstall -r test-run/requirements.txt
 
 build_osx:
-	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS}
-	make -j
+	export PATH=${PATH}:/usr/local/bin ; \
+		cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+			-DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS} && \
+		make -j
 
 test_osx_no_deps: build_osx
 	# Limits: Increase the maximum number of open file descriptors on macOS:
-- 
2.17.1

  reply	other threads:[~2019-12-18  6:11 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-18  6:11 [Tarantool-patches] [PATCH v3 0/2] gitlab-ci: add Catalina OSX 10.15 Alexander V. Tikhonov
2019-12-18  6:11 ` Alexander V. Tikhonov [this message]
2019-12-18  6:11 ` [Tarantool-patches] [PATCH v3 2/2] " Alexander V. Tikhonov
2020-01-20 12:26   ` Alexander Tikhonov
2020-01-21 16:08     ` Oleg Piskunov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=eea51e57f329de141f01e2bb3afa77b6be729ca5.1576648181.git.avtikhon@tarantool.org \
    --to=avtikhon@tarantool.org \
    --cc=alexander.turenko@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v3 1/2] build: tune OSX environment' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox