<HTML><BODY>Igor, thanks for your review, I've made all the changes as you suggested.<br><br><br><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">
Понедельник, 16 декабря 2019, 16:25 +03:00 от Igor Munkin <imun@tarantool.org>:<br><br><div id=""><div class="js-helper js-readmsg-msg"><div><div id="style_15765027231558808187_BODY">Sasha,<br><br>
Thanks for the patch, it totally LGTM. I left a couple of minor comments<br>
below, feel free to ignore them.<br><br>
On 09.12.19, Alexander V. Tikhonov wrote:<br>
> Added Catalina OSX 10.15 to gitlab-ci testing and removed OSX 10.13,<br>
> due to decided to have only 2 last major releases, for now it is<br>
> 10.14 and 10.15 OSX versions.<br>
> <br>
> Also added homebrew installation routine as it was suggested in its<br>
> instructions. Added path in environment to reach the pip binary that<br>
> was additionally installed based on python2 version in addition to<br>
> pip3 which is the default in Catalina OSX 10.15. Added installation<br>
> of the cmake and tool. Added upgrade of the OSX packages to avoid of<br>
> fails on already existed packages, but of the previous versions.<br>
> ---<br>
> <br>
> Github: <a href="https://github.com/tarantool/tarantool/tree/avtikhon/osx_15_catalina" target="_blank">https://github.com/tarantool/tarantool/tree/avtikhon/osx_15_catalina</a><br>
> <br>
> .gitlab-ci.yml | 8 ++++----<br>
> .travis.mk | 30 +++++++++++++++++++++++++-----<br>
> 2 files changed, 29 insertions(+), 9 deletions(-)<br>
> <br>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml<br>
> index 3af5a3c8a..d3cb959d0 100644<br>
> --- a/.gitlab-ci.yml<br>
> +++ b/.gitlab-ci.yml<br>
> @@ -90,15 +90,15 @@ release_asan_clang8:<br>
> script:<br>
> - ${GITLAB_MAKE} test_asan_debian_no_deps<br>
> <br>
> -osx_13_release:<br>
> +osx_15_release:<br>
> <<: *release_only_definition<br>
> <<: *vbox_definition<br>
> tags:<br>
> - - vms_osx_13<br>
> + - vms_test<br>
> variables:<br>
> - VMS_NAME: 'osx_13'<br>
> + VMS_NAME: 'osx_15'<br>
> VMS_USER: 'tarantool'<br>
> - VMS_PORT: '2212'<br>
> + VMS_PORT: '2242'<br>
> script:<br>
> - ${GITLAB_MAKE} vms_test_osx<br>
> <br>
> diff --git a/.travis.mk b/.travis.mk<br>
> index 42969ff56..c8cb273fa 100644<br>
> --- a/.travis.mk<br>
> +++ b/.travis.mk<br>
> @@ -127,17 +127,37 @@ test_asan_debian: deps_debian deps_buster_clang_8 test_asan_debian_no_deps<br>
> # OSX #<br>
> #######<br>
> <br>
> +OSX_PKGS=openssl readline curl icu4c libiconv zlib autoconf automake libtool cmake<br>
> +<br>
> deps_osx:<br>
> - brew update<br>
> - brew install openssl readline curl icu4c libiconv zlib autoconf automake libtool --force<br>
> + # install brew using command from Homebrew repository instructions:<br>
> + # <a href="https://github.com/Homebrew/install" target="_blank">https://github.com/Homebrew/install</a><br><br>
Minor: As discussed offline, please consider to add a comment regarding<br>
the echo command below. I guess something like one below will be a great<br>
one:<br>
| XXX Fragile: echo command below is required since brew installation<br>
| script obliges the one to enter a newline for confirming the<br>
| installation via Ruby script.<br></div></div></div></div></blockquote>Added.<br><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;"><div id=""><div class="js-helper js-readmsg-msg"><div><div id="style_15765027231558808187_BODY"><br>
Minor: Please sub `...` to $(...) if possible.<br></div></div></div></div></blockquote>Changed.<br><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;"><div id=""><div class="js-helper js-readmsg-msg"><div><div id="style_15765027231558808187_BODY"><br>
> + export PATH=${PATH}:/usr/local/bin ; \<br>
> + brew update || echo | /usr/bin/ruby -e \<br>
> + "`curl -fsSL <a href="https://raw.githubusercontent.com/Homebrew/install/master/install`" target="_blank">https://raw.githubusercontent.com/Homebrew/install/master/install`</a>"<br>
> + # try to install the packages either upgrade it to avoid of fails<br>
> + # if the package allready exists but of the previous version<br>
> + export PATH=${PATH}:/usr/local/bin ; \<br>
> + brew install --force ${OSX_PKGS} || brew upgrade ${OSX_PKGS}<br>
> + # OSX 10.15 Catalina started to use Xcode 11 which has 'Deprications'<br>
> + # part in Release Notes:<br>
> + # Use of Python 2.7 isn’t recommended. This version is included in<br>
> + # macOS for compatibility with legacy software. Future versions of<br>
> + # macOS won’t include Python 2.7. Instead, it’s recommended that<br>
> + # you run python3 in Terminal. (51097165)<br>
> python2 -V || brew install python2 --force<br>
> curl --silent --show-error --retry 5 <a href="https://bootstrap.pypa.io/get-pip.py" target="_blank">https://bootstrap.pypa.io/get-pip.py</a> >get-pip.py<br>
> python get-pip.py --user<br>
> - pip install --user --force-reinstall -r test-run/requirements.txt<br>
> + # To make pip tools available, the PATH environment must include the<br>
> + # path to its binaries<br>
> + export PATH=${PATH}:/Users/tarantool/Library/Python/2.7/bin ; \<br>
> + pip install --user --force-reinstall -r test-run/requirements.txt<br>
> <br>
> build_osx:<br>
> - cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS}<br>
> - make -j<br>
> + export PATH=${PATH}:/usr/local/bin ; \<br>
> + cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \<br>
> + -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS} && \<br>
> + make -j<br>
> <br>
> test_osx_no_deps: build_osx<br>
> # Limits: Increase the maximum number of open file descriptors on macOS:<br>
> -- <br>
> 2.17.1<br>
> <br><br>
-- <br>
Best regards,<br>
IM<br></div></div></div></div></blockquote>
<br>
<br>-- <br>Alexander Tikhonov<br></BODY></HTML>