Re: [PATCH] ci(vs-build): stop passing the iconv library location explicitly
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Dec 4, 2020, 22:12 UTC
- Message-ID
- <nycvar.QRO.7.76.6.2012041612300.25979@tvgsbejvaqbjf.bet>
- In-Reply-To
- <xmqqv9dhe3wi.fsf@gitster.c.googlers.com>
Hi Junio,
On Fri, 4 Dec 2020, Junio C Hamano wrote:
Show 23 quoted lines
> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> > writes: > > > From: Dennis Ameling <dennis@dennisameling.com> > > > > Something changed in `vcpkg` (which we use in our Visual C++ build to > > provide the dependencies such as libcurl) and our `vs-build` job started > > failing in CI. The reason is that we had a work-around in place to help > > CMake find iconv, and this work-around is neither needed nor does it > > work anymore. > > > > For the full discussion with the vcpkg project, see this comment: > > https://github.com/microsoft/vcpkg/issues/14780#issuecomment-735368280 > > > > Signed-off-by: Dennis Ameling <dennis@dennisameling.com> > > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> > > --- > > ci: fix the vs-build job so that CI builds pass again > > > > This was noticed first in a Git for Windows PR. > > This is probably the same breakage I've been seeing, e.g. > https://github.com/git/git/runs/1494253517
Yes.
> I guess we should just apply directly to 'master' (or 'maint' and > merge up), but I can queue it just like all other topics and have it > traverse through 'seen'->'next'->'master'.
Whatever is easier for you.
Thanks, Dscho