From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 80A914696C4 for ; Wed, 18 Dec 2019 09:11:16 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Wed, 18 Dec 2019 09:11:11 +0300 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Tarantool-patches] [PATCH v3 1/2] build: tune OSX environment List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Turenko Cc: tarantool-patches@dev.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