[Tarantool-patches] [PATCH v1 1/2] build: disable at OSX curl SSL

[Alexander Tikhonov]

Hi, Oleg, thanks for the review, please check my comments below.

  
>Понедельник, 13 апреля 2020, 13:57 +03:00 от Oleg Piskunov <o.piskunov at tarantool.org>:
> 
>Hi,
> 
>Sasha, thanks for the patch. See my comment below.
>  
>>Четверг, 9 апреля 2020, 11:41 +03:00 от Alexander V. Tikhonov < avtikhon at tarantool.org >:
>> 
>>Formula tntpython2.rb consist of the packages which download target host
>>does not have valid SSL certificate, disabled curl SSL check for it.
>>---
>> .travis.mk | 15 +++++++++++++--
>> 1 file changed, 13 insertions(+), 2 deletions(-)
>>
>>diff --git a/.travis.mk b/.travis.mk
>>index f709a18b6..e79d50b19 100644
>>--- a/.travis.mk
>>+++ b/.travis.mk
>>@@ -151,7 +151,7 @@ test_static_docker_build:
>> 
>> # since Python 2 is EOL it's latest commit from tapped local formula is used
>> OSX_PKGS=openssl readline curl icu4c libiconv zlib autoconf automake libtool \
>>- cmake file://${PWD}/tools/brew_taps/tntpython2.rb
>>+ cmake
>*  
>As you move formula from this place, please move above comment as well.
Right, I forgot to move it down, corrected.
>*  
>Would be good to have one line in this place:
>OSX_PKGS=openssl readline curl icu4c libiconv zlib autoconf automake libtool cmake
Unfortunately the string breaks the limit of 80 chars and must be splitted.
>> 
>> deps_osx:
>>  # install brew using command from Homebrew repository instructions:
>>@@ -164,7 +164,18 @@ deps_osx:
>>  # 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}
>>- pip install --force-reinstall -r test-run/requirements.txt
>>+ # Formula tntpython2.rb consist of the packages which download target
>>+ # host does not have valid SSL certificate, disabled curl SSL
>>+ # check for it.
>Above comment really ugly. Please rewrite it more clearly.
Sure, I’ve rewrote it once again.
>>+ echo insecure >>${HOME}/.curlrc
>>+ brew install --force file://${PWD}/tools/brew_taps/tntpython2.rb || true
>>+ sed '$d' ${HOME}/.curlrc >${HOME}/.curlrc.new && \
>>+ mv ${HOME}/.curlrc.new ${HOME}/.curlrc
>>+ python2 -V
>>+ pip install --trusted-host files.pythonhosted.org \
>>+ --upgrade pip setuptools
>>+ pip install --trusted-host files.pythonhosted.org \
>>+ --force-reinstall -r test-run/requirements.txt
>> 
>> build_osx:
>>  cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS}
>>--
>>2.17.1
>>  
> 
> 
>--
>Oleg Piskunov
>  
 
 
--
Alexander Tikhonov
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.tarantool.org/pipermail/tarantool-patches/attachments/20200413/332f060c/attachment.html>