From: "Alexander V. Tikhonov" <avtikhon@tarantool.org> To: Oleg Piskunov <o.piskunov@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v5 1/2] build: tune OSX environment Date: Wed, 22 Jan 2020 10:28:48 +0300 [thread overview] Message-ID: <a0df833ba6a0ca7356e9ce8b5c5384e66ce880d8.1579677934.git.avtikhon@tarantool.org> (raw) In-Reply-To: <cover.1579677934.git.avtikhon@tarantool.org> In-Reply-To: <cover.1579677934.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. Added reinstallation of the python2 with force option to be able to install it to /usr/local/ path to make pip install there too. --- .travis.mk | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/.travis.mk b/.travis.mk index 42969ff56..60bbf3c1b 100644 --- a/.travis.mk +++ b/.travis.mk @@ -127,16 +127,27 @@ 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 python2 + deps_osx: - brew update - brew install openssl readline curl icu4c libiconv zlib autoconf automake libtool --force - 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 + # 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. + 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 + brew install --force ${OSX_PKGS} || brew upgrade ${OSX_PKGS} + curl --silent --show-error --retry 5 \ + https://bootstrap.pypa.io/get-pip.py >get-pip.py + python get-pip.py + pip install --force-reinstall -r test-run/requirements.txt build_osx: - cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS} + cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS} && \ make -j test_osx_no_deps: build_osx @@ -153,8 +164,9 @@ test_osx_no_deps: build_osx ulimit -n ${MAX_FILES} || : ; \ ulimit -n ; \ cd test && ./test-run.py --force $(TEST_RUN_EXTRA_PARAMS) \ - app/ app-tap/ box/ box-py/ box-tap/ engine/ engine_long/ long_run-py/ luajit-tap/ \ - replication-py/ small/ sql/ sql-tap/ swim/ unit/ vinyl/ wal_off/ xlog/ xlog-py/ + app/ app-tap/ box/ box-py/ box-tap/ engine/ engine_long/ \ + long_run-py/ luajit-tap/ replication-py/ small/ sql/ \ + sql-tap/ swim/ unit/ vinyl/ wal_off/ xlog/ xlog-py/ test_osx: deps_osx test_osx_no_deps -- 2.17.1
next prev parent reply other threads:[~2020-01-22 7:28 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-22 7:28 [Tarantool-patches] [PATCH v5 0/2] add Catalina OSX 10.15 to gitlab-ci Alexander V. Tikhonov 2020-01-22 7:28 ` Alexander V. Tikhonov [this message] 2020-01-22 10:58 ` [Tarantool-patches] [PATCH v5 1/2] build: tune OSX environment Oleg Piskunov 2020-01-22 7:28 ` [Tarantool-patches] [PATCH v5 2/2] gitlab-ci: add Catalina OSX 10.15 Alexander V. Tikhonov 2020-01-22 10:57 ` 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=a0df833ba6a0ca7356e9ce8b5c5384e66ce880d8.1579677934.git.avtikhon@tarantool.org \ --to=avtikhon@tarantool.org \ --cc=o.piskunov@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v5 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