Re: [PATCH RFC v2 2/2] Move libgit.a sources into separate "lib/" directory
Hi Patrick,
On Mon, 22 Jun 2026, Patrick Steinhardt wrote:
Show 13 quoted lines
> diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
> index cf341d74db..a8402babd9 100644
> --- a/.github/workflows/main.yml
> +++ b/.github/workflows/main.yml
> @@ -179,7 +179,7 @@ jobs:
> uses: actions/checkout@v6
> with:
> repository: 'microsoft/vcpkg'
> - path: 'compat/vcbuild/vcpkg'
> + path: 'lib/compat/vcbuild/vcpkg'
> - name: download vcpkg artifacts
> uses: git-for-windows/get-azure-pipelines-artifact@v0
> with:
Please also adopt:
-- snip --
From 1d09a51d426bd3592e4f4b0331f7715ab3b5d502 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 26 Jun 2026 14:39:19 +0200
Subject: [PATCH] fixup??? Move libgit.a sources into separate "lib/" directory
Turns out that there was one path that was forgotten to be adjusted.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
.github/workflows/main.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 29d2057bde4b..57ad4ba64f67 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -188,6 +188,7 @@ jobs:
with:
repository: git/git
definitionId: 9
+ path: lib/compat
- name: add msbuild to PATH
uses: microsoft/setup-msbuild@v3
- name: copy dlls to root
-- snap --
This is needed to fix the `vs-build` job, see
https://github.com/git-for-windows/git/actions/runs/28242360731 for proof
that it's now working.
Thank you,
Johannes
> @@ -189,11 +189,11 @@ jobs:
> uses: microsoft/setup-msbuild@v3
> - name: copy dlls to root
> shell: cmd
> - run: compat\vcbuild\vcpkg_copy_dlls.bat release
> + run: lib\compat\vcbuild\vcpkg_copy_dlls.bat release
> - name: generate Visual Studio solution
> shell: bash
> run: |
> - cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \
> + cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/lib/compat/vcbuild/vcpkg/installed/x64-windows \
> -DNO_GETTEXT=YesPlease -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
> @@ -201,7 +201,7 @@ jobs:
> shell: bash
> env:
> MSVC: 1
> - VCPKG_ROOT: ${{github.workspace}}\compat\vcbuild\vcpkg
> + VCPKG_ROOT: ${{github.workspace}}\lib\compat\vcbuild\vcpkg
> run: |
> mkdir -p artifacts &&
> eval "$(make -n artifacts-tar INCLUDE_DLLS_IN_ARTIFACTS=YesPlease ARTIFACTS_DIRECTORY=artifacts NO_GETTEXT=YesPlease 2>&1 | grep ^tar)"
> [...]
Johannes Schindelin <johannes.schindelin@gmx.de>