From a79dc7b6010e47c06b0eb52ccee38d207c2b9d55 Mon Sep 17 00:00:00 2001 From: Tal Regev Date: Wed, 31 Jul 2024 21:49:51 +0300 Subject: [PATCH] GHA/windows: remove vcpkg bin path in MSVC jobs - the path is wrong, because we compile on debug, and we are using the release bin path. - the path is not needed, cmake curl copy the needed dlls to the compilation cmake folder where the curl exe is found. Closes #14329 --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 702da55efc..fb9376d42b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -607,7 +607,7 @@ jobs: run: | find . -name '*.exe' -o -name '*.dll' | grep -v '/examples/' if [ '${{ matrix.plat }}' != 'uwp' ]; then - PATH="$PWD/bld/lib:$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.arch }}-${{ matrix.plat }}/bin:$PATH" + PATH="$PWD/bld/lib:$PATH" bld/src/curl.exe --disable --version fi @@ -629,5 +629,5 @@ jobs: elif [[ '${{ matrix.config }}' = *'-DUSE_LIBIDN2=ON'* ]]; then TFLAGS+=' ~165 ~1448 ~2046 ~2047' fi - PATH="$PWD/bld/lib:$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.arch }}-${{ matrix.plat }}/bin:$PATH" + PATH="$PWD/bld/lib:$PATH" cmake --build bld --config '${{ matrix.type }}' --target test-ci -- 2.47.3