From 8be2daae0fc60a9ab9d16fd8a399ece39174f4bc Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 22 Jun 2026 04:03:45 +0200 Subject: [PATCH] GHA/windows: set `VCPKG_APPLOCAL_DEPS=OFF` for vcpkg jobs Add the necessary directory to `PATH` instead. To disable a vcpkg feature (auto-copying DLL dependencies next to the build targets) that was causing CI flakiness in the libssh2 repository. In curl it currently cannot cause flakiness because targets (with DLL dependencies) reside in separate directories. AFAIU this vcpkg feature has been present and enabled by default for a long time, but only a recent update made it visible in the log and flaky at the same time, due to switching implementation. This patch removes log noise and potential issues, improves efficiency, and saves disk space: 74MB -> 71 in UWP, and 69MB -> 65 in the arm64 job. Time saving is negligible with current jobs. Refs: https://github.com/libssh2/libssh2/pull/2114 https://github.com/libssh2/libssh2/commit/30a0484cb7b350d779dbca87dbf9d7ba18a03547 https://github.com/microsoft/vcpkg/pull/52315 https://learn.microsoft.com/vcpkg/reference/installation-tree-layout Closes #22189 --- .github/workflows/windows.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 96cfecde26..4bf2ff5c4a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -1072,6 +1072,7 @@ jobs: options+=" -DVCPKG_INSTALLED_DIR=$VCPKG_INSTALLATION_ROOT/installed" options+=" -DVCPKG_TARGET_TRIPLET=${MATRIX_ARCH}-${MATRIX_PLAT}" options+=" -DCMAKE_C_COMPILER_TARGET=${MATRIX_ARCH}-${MATRIX_PLAT}" + options+=' -DVCPKG_APPLOCAL_DEPS=OFF' fi cmake -B "bld${_chkprefill}" ${options} \ -DCMAKE_C_FLAGS="${cflags}" \ @@ -1110,7 +1111,7 @@ jobs: /usr/bin/find . \( -name '*.exe' -o -name '*.dll' -o -name '*.lib' -o -name '*.pdb' \) -print0 | grep -z curl | xargs -0 file -- /usr/bin/find . \( -name '*.exe' -o -name '*.dll' -o -name '*.lib' -o -name '*.pdb' \) -print0 | grep -z curl | xargs -0 stat -c '%10s bytes: %n' -- if [ "${MATRIX_PLAT}" != 'uwp' ]; then # Missing: ucrtbased.dll, VCRUNTIME140D.dll, VCRUNTIME140D_APP.dll - PATH="$PWD/bld/lib/${MATRIX_TYPE}:$PATH" + PATH="$PWD/bld/lib/${MATRIX_TYPE}:$(cygpath --unix "${VCPKG_INSTALLATION_ROOT}")/installed/${MATRIX_ARCH}-${MATRIX_PLAT}/${MATRIX_TYPE}/bin:$PATH" "bld/src/${MATRIX_TYPE}/curl.exe" --disable --version fi @@ -1187,7 +1188,7 @@ jobs: PATH="/c/OpenSSH-Win64:$PATH" fi fi - PATH="$PWD/bld/lib/${MATRIX_TYPE}:$PATH:/c/my-stunnel/bin" + PATH="$PWD/bld/lib/${MATRIX_TYPE}:$(cygpath --unix "${VCPKG_INSTALLATION_ROOT}")/installed/${MATRIX_ARCH}-${MATRIX_PLAT}/${MATRIX_TYPE}/bin:$PATH:/c/my-stunnel/bin" cmake --build bld --config "${MATRIX_TYPE}" --target test-ci - name: 'build examples'