* [tarantool-patches] Re: [PATCH v1] test: upgrade curl to 7.65.3 or newer version [not found] <4b1bf4c1c54bae21c74db1854c5fc1e0d05ef275.1563952640.git.avtikhon@tarantool.org> @ 2019-07-24 9:44 ` Alexander Turenko 2019-07-26 9:06 ` [tarantool-patches] Re[2]: " Alexander Tikhonov 0 siblings, 1 reply; 3+ messages in thread From: Alexander Turenko @ 2019-07-24 9:44 UTC (permalink / raw) To: Alexander V. Tikhonov; +Cc: tarantool-patches 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 > ^ permalink raw reply [flat|nested] 3+ messages in thread
* [tarantool-patches] Re[2]: [PATCH v1] test: upgrade curl to 7.65.3 or newer version 2019-07-24 9:44 ` [tarantool-patches] Re: [PATCH v1] test: upgrade curl to 7.65.3 or newer version Alexander Turenko @ 2019-07-26 9:06 ` Alexander Tikhonov 2019-07-26 15:29 ` [tarantool-patches] " Alexander Turenko 0 siblings, 1 reply; 3+ messages in thread From: Alexander Tikhonov @ 2019-07-26 9:06 UTC (permalink / raw) To: Alexander Turenko; +Cc: tarantool-patches [-- Attachment #1: Type: text/plain, Size: 2195 bytes --] >Среда, 24 июля 2019, 12:44 +03:00 от Alexander Turenko < alexander.turenko@tarantool.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'? I've meant the already installed. > > >> + brew upgrade curl || true > >There is `brew update` above. Right, using force it will install needed 7.65.3 version. > > >Why not just revert (`git revert`) >2e880af097a548036278f43b3d6b0f6534a66bac and add proper description to >its commit message? Please, check that this will be sufficient. I've checked the rollback only and it was enough to fix the issue as I saw in results. > > >> 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 >> -- Alexander Tikhonov [-- Attachment #2: Type: text/html, Size: 4622 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
* [tarantool-patches] Re: [PATCH v1] test: upgrade curl to 7.65.3 or newer version 2019-07-26 9:06 ` [tarantool-patches] Re[2]: " Alexander Tikhonov @ 2019-07-26 15:29 ` Alexander Turenko 0 siblings, 0 replies; 3+ messages in thread From: Alexander Turenko @ 2019-07-26 15:29 UTC (permalink / raw) To: Alexander Tikhonov; +Cc: tarantool-patches, Kirill Yukhin > >> + brew upgrade curl || true > > > > There is `brew update` above. > > Right, using force it will install needed 7.65.3 version. > > > > Why not just revert (`git revert`) > > 2e880af097a548036278f43b3d6b0f6534a66bac and add proper description to > > its commit message? Please, check that this will be sufficient. > > I've checked the rollback only and it was enough to fix the issue as I saw in results. Great. Pushed to master, 2.1 and 1.10. CCed Kirill. WBR, Alexander Turenko. ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-07-26 15:29 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <4b1bf4c1c54bae21c74db1854c5fc1e0d05ef275.1563952640.git.avtikhon@tarantool.org> 2019-07-24 9:44 ` [tarantool-patches] Re: [PATCH v1] test: upgrade curl to 7.65.3 or newer version Alexander Turenko 2019-07-26 9:06 ` [tarantool-patches] Re[2]: " Alexander Tikhonov 2019-07-26 15:29 ` [tarantool-patches] " Alexander Turenko
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox