[Tarantool-patches] [PATCH v1] gitlab-ci: add Catalina OSX 10.15
Alexander Tikhonov
avtikhon at tarantool.org
Mon Dec 16 16:54:14 MSK 2019
Igor, thanks for your review, I've made all the changes as you suggested.
>Понедельник, 16 декабря 2019, 16:25 +03:00 от Igor Munkin <imun at tarantool.org>:
>
>Sasha,
>
>Thanks for the patch, it totally LGTM. I left a couple of minor comments
>below, feel free to ignore them.
>
>On 09.12.19, Alexander V. Tikhonov wrote:
>> Added Catalina OSX 10.15 to gitlab-ci testing and removed OSX 10.13,
>> due to decided to have only 2 last major releases, for now it is
>> 10.14 and 10.15 OSX versions.
>>
>> Also added homebrew installation routine as it was suggested in its
>> instructions. Added path in environment to reach the pip binary that
>> was additionally installed based on python2 version in addition to
>> pip3 which is the default in Catalina OSX 10.15. Added installation
>> of the cmake and tool. Added upgrade of the OSX packages to avoid of
>> fails on already existed packages, but of the previous versions.
>> ---
>>
>> Github: https://github.com/tarantool/tarantool/tree/avtikhon/osx_15_catalina
>>
>> .gitlab-ci.yml | 8 ++++----
>> .travis.mk | 30 +++++++++++++++++++++++++-----
>> 2 files changed, 29 insertions(+), 9 deletions(-)
>>
>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>> index 3af5a3c8a..d3cb959d0 100644
>> --- a/.gitlab-ci.yml
>> +++ b/.gitlab-ci.yml
>> @@ -90,15 +90,15 @@ release_asan_clang8:
>> script:
>> - ${GITLAB_MAKE} test_asan_debian_no_deps
>>
>> -osx_13_release:
>> +osx_15_release:
>> <<: *release_only_definition
>> <<: *vbox_definition
>> tags:
>> - - vms_osx_13
>> + - vms_test
>> variables:
>> - VMS_NAME: 'osx_13'
>> + VMS_NAME: 'osx_15'
>> VMS_USER: 'tarantool'
>> - VMS_PORT: '2212'
>> + VMS_PORT: '2242'
>> script:
>> - ${GITLAB_MAKE} vms_test_osx
>>
>> diff --git a/.travis.mk b/.travis.mk
>> index 42969ff56..c8cb273fa 100644
>> --- a/.travis.mk
>> +++ b/.travis.mk
>> @@ -127,17 +127,37 @@ 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
>
>Minor: As discussed offline, please consider to add a comment regarding
>the echo command below. I guess something like one below will be a great
>one:
>| XXX Fragile: echo command below is required since brew installation
>| script obliges the one to enter a newline for confirming the
>| installation via Ruby script.
Added.
>
>Minor: Please sub `...` to $(...) if possible.
Changed.
>
>> + 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 allready exists but of the previous version
>> + export PATH=${PATH}:/usr/local/bin ; \
>> + brew install --force ${OSX_PKGS} || brew upgrade ${OSX_PKGS}
>> + # OSX 10.15 Catalina started to use Xcode 11 which has 'Deprications'
>> + # part in Release Notes:
>> + # Use of Python 2.7 isn’t recommended. This version is included in
>> + # macOS for compatibility with legacy software. Future versions of
>> + # macOS won’t include Python 2.7. Instead, it’s recommended that
>> + # you run python3 in Terminal. (51097165)
>> 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
>> + # To make pip tools available, the PATH environment must include the
>> + # path to its binaries
>> + export PATH=${PATH}:/Users/tarantool/Library/Python/2.7/bin ; \
>> + 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
>>
>
>--
>Best regards,
>IM
--
Alexander Tikhonov
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.tarantool.org/pipermail/tarantool-patches/attachments/20191216/530423b5/attachment.html>
More information about the Tarantool-patches
mailing list