From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id A2F1825C94 for ; Wed, 24 Jul 2019 05:44:27 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id v7_8Vm3gE8-3 for ; Wed, 24 Jul 2019 05:44:27 -0400 (EDT) Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 60F0525C8F for ; Wed, 24 Jul 2019 05:44:27 -0400 (EDT) Date: Wed, 24 Jul 2019 12:44:10 +0300 From: Alexander Turenko Subject: [tarantool-patches] Re: [PATCH v1] test: upgrade curl to 7.65.3 or newer version Message-ID: <20190724094410.wubzbzdb4dg4itdd@tkn_work_nb> References: <4b1bf4c1c54bae21c74db1854c5fc1e0d05ef275.1563952640.git.avtikhon@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <4b1bf4c1c54bae21c74db1854c5fc1e0d05ef275.1563952640.git.avtikhon@tarantool.org> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: "Alexander V. Tikhonov" Cc: tarantool-patches@freelists.org On Wed, Jul 24, 2019 at 10:17:55AM +0300, Alexander V. Tikhonov wrote: > Due to the new 7.65.3 curl version released on 2019-07-19, > removed temporary workaround that downgraded the curl to > 7.65.0 which was committed at: > > 2e880af097a548036278f43b3d6b0f6534a66bac ("travis-ci: freeze curl version on 7.65.0 on OS X") > > Follows up #4288 > --- > > Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4288-upgrade-curl > Issue: https://github.com/tarantool/tarantool/issues/4288 > > .travis.mk | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/.travis.mk b/.travis.mk > index 7d349bc21..7947dd12f 100644 > --- a/.travis.mk > +++ b/.travis.mk > @@ -119,12 +119,8 @@ deps_osx: > brew update > brew install openssl readline curl icu4c libiconv --force > python2 -V || brew install python2 --force > - ################################################### > - # Temporary workaround to curl version from > - # issue #4288 to downgrade from 7.65.1 to 7.65.0: > - # TODO: remove the workaround after 7.65.2 released > - brew reinstall https://raw.githubusercontent.com/Homebrew/homebrew-core/e47f3e2682fa3d8a6ee58ded40718a1326e08a6d/Formula/curl.rb > - ################################################### > + # install the curl with version 7.65.3 or later instead of default 7.65.0 What does you mean with the word 'default'? > + brew upgrade curl || true There is `brew update` above. Why not just revert (`git revert`) 2e880af097a548036278f43b3d6b0f6534a66bac and add proper description to its commit message? Please, check that this will be sufficient. > 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 > -- > 2.17.1 >