diff mbox series

ci(vs-build): stop passing the iconv library location explicitly

Message ID pull.805.git.1607091741254.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit e66590348a78d69b08dff8f6a1d978982e61465a
Headers show
Series ci(vs-build): stop passing the iconv library location explicitly | expand

Commit Message

Dennis Ameling Dec. 4, 2020, 2:22 p.m. UTC 
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.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-805%2Fdscho%2Fvs-build-and-libiconv-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-805/dscho/vs-build-and-libiconv-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/805

 .github/workflows/main.yml      | 1 -
 compat/vcbuild/scripts/clink.pl | 2 +-
 contrib/buildsystems/engine.pl  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)


base-commit: 898f80736c75878acc02dc55672317fcc0e0a5a6

Comments

Junio C Hamano Dec. 4, 2020, 8:02 p.m. UTC | #1 
"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

Thanks for taking care of it.

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'.
Johannes Schindelin Dec. 4, 2020, 10:12 p.m. UTC | #2 
Hi Junio,

On Fri, 4 Dec 2020, Junio C Hamano wrote:

> "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
diff mbox series

Patch

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a940997f1b..f1f0d1fe35 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -201,7 +201,6 @@  jobs:
       shell: bash
       run: |
         cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \
-        -DIconv_LIBRARY=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows/lib/libiconv.lib -DIconv_INCLUDE_DIR=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows/include \
         -DMSGFMT_EXE=`pwd`/git-sdk-64-minimal/mingw64/bin/msgfmt.exe -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON
     - name: MSBuild
       run: msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142
diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
index df167d1e1a..3bd824154b 100755
--- a/compat/vcbuild/scripts/clink.pl
+++ b/compat/vcbuild/scripts/clink.pl
@@ -45,7 +45,7 @@ 
 		push(@args, "zlib.lib");
 	    }
 	} elsif ("$arg" eq "-liconv") {
-		push(@args, "libiconv.lib");
+		push(@args, "iconv.lib");
 	} elsif ("$arg" eq "-lcrypto") {
 		push(@args, "libcrypto.lib");
 	} elsif ("$arg" eq "-lssl") {
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index 2ff9620459..ed6c45988a 100755
--- a/contrib/buildsystems/engine.pl
+++ b/contrib/buildsystems/engine.pl
@@ -351,7 +351,7 @@  sub handleLinkLine
         } elsif ("$part" eq "-lexpat") {
             push(@libs, "libexpat.lib");
         } elsif ("$part" eq "-liconv") {
-            push(@libs, "libiconv.lib");
+            push(@libs, "iconv.lib");
         } elsif ($part =~ /^[-\/]/) {
             push(@lflags, $part);
         } elsif ($part =~ /\.(a|lib)$/) {