@@ -416,17 +416,23 @@ jobs:
416416 id : vcpkg-paths-linux
417417 shell : bash
418418 run : |
419- # Find vcpkg installed directory (lukka action uses a UUID-based path)
420- # Use GITHUB_WORKSPACE env var which resolves correctly in containers
421- vcpkg_installed=$(find "${GITHUB_WORKSPACE}" -type d -path "*/vcpkg_installed/x64-linux" 2>/dev/null | head -1)
419+ # lukka/run- vcpkg sets VCPKG_INSTALLED_DIR with a UUID-based path
420+ # Use that directly instead of trying to find it
421+ echo "Debug: VCPKG_INSTALLED_DIR=${VCPKG_INSTALLED_DIR:-not set}"
422422
423- # Also try container path if not found
424- if [ -z "${vcpkg_installed}" ]; then
425- vcpkg_installed=$(find "/__w" -type d -path "*/vcpkg_installed/x64-linux" 2>/dev/null | head -1)
423+ if [ -n "${VCPKG_INSTALLED_DIR}" ] && [ -d "${VCPKG_INSTALLED_DIR}/x64-linux" ]; then
424+ vcpkg_installed="${VCPKG_INSTALLED_DIR}/x64-linux"
425+ else
426+ # Fallback: try to find it
427+ vcpkg_installed=$(find "${GITHUB_WORKSPACE}" -type d -path "*/vcpkg_installed/x64-linux" 2>/dev/null | head -1)
428+ if [ -z "${vcpkg_installed}" ]; then
429+ vcpkg_installed=$(find "/__w" -type d -path "*/vcpkg_installed/x64-linux" 2>/dev/null | head -1)
430+ fi
426431 fi
427432
428433 if [ -z "${vcpkg_installed}" ] || [ ! -d "${vcpkg_installed}" ]; then
429434 echo "ERROR: Could not find vcpkg installed directory!"
435+ echo "VCPKG_INSTALLED_DIR=${VCPKG_INSTALLED_DIR:-not set}"
430436 echo "GITHUB_WORKSPACE=${GITHUB_WORKSPACE}"
431437 find "${GITHUB_WORKSPACE}" -type d -name "vcpkg_installed" 2>/dev/null || true
432438 find "/__w" -type d -name "vcpkg_installed" 2>/dev/null || true
@@ -488,9 +494,11 @@ jobs:
488494 extra-args : |
489495 -D Boost_VERBOSE=ON
490496 -D BOOST_INCLUDE_LIBRARIES="${{ steps.patch.outputs.module }}"
491- ${{ runner.os == 'Windows' && format('-D CMAKE_TOOLCHAIN_FILE={0}/vcpkg/scripts/buildsystems/vcpkg.cmake', github.workspace) || '' }}
492497 ${{ runner.os == 'Linux' && format('-D WolfSSL_INCLUDE_DIR={0}', steps.vcpkg-paths-linux.outputs.wolfssl_include) || '' }}
493498 ${{ runner.os == 'Linux' && format('-D WolfSSL_LIBRARY={0}', steps.vcpkg-paths-linux.outputs.wolfssl_library) || '' }}
499+ # Windows: CMAKE_TOOLCHAIN_FILE is set via environment variable in "Set vcpkg paths" step
500+ # The action picks it up automatically. Don't pass via extra-args (format() corrupts backslashes)
501+ toolchain : ${{ env.CMAKE_TOOLCHAIN_FILE }}
494502 package : false
495503 package-artifact : false
496504 ref-source-dir : boost-root/libs/corosio
@@ -524,9 +532,9 @@ jobs:
524532 extra-args : |
525533 -D BOOST_CI_INSTALL_TEST=ON
526534 -D CMAKE_PREFIX_PATH=${{ steps.patch.outputs.workspace_root }}/.local
527- ${{ runner.os == 'Windows' && format('-D CMAKE_TOOLCHAIN_FILE={0}/vcpkg/scripts/buildsystems/vcpkg.cmake', github.workspace) || '' }}
528535 ${{ runner.os == 'Linux' && format('-D WolfSSL_INCLUDE_DIR={0}', steps.vcpkg-paths-linux.outputs.wolfssl_include) || '' }}
529536 ${{ runner.os == 'Linux' && format('-D WolfSSL_LIBRARY={0}', steps.vcpkg-paths-linux.outputs.wolfssl_library) || '' }}
537+ toolchain : ${{ env.CMAKE_TOOLCHAIN_FILE }}
530538 ref-source-dir : boost-root/libs/corosio
531539 trace-commands : true
532540
@@ -549,9 +557,9 @@ jobs:
549557 cmake-version : ' >=3.15'
550558 extra-args : |
551559 -D BOOST_CI_INSTALL_TEST=OFF
552- ${{ runner.os == 'Windows' && format('-D CMAKE_TOOLCHAIN_FILE={0}/vcpkg/scripts/buildsystems/vcpkg.cmake', github.workspace) || '' }}
553560 ${{ runner.os == 'Linux' && format('-D WolfSSL_INCLUDE_DIR={0}', steps.vcpkg-paths-linux.outputs.wolfssl_include) || '' }}
554561 ${{ runner.os == 'Linux' && format('-D WolfSSL_LIBRARY={0}', steps.vcpkg-paths-linux.outputs.wolfssl_library) || '' }}
562+ toolchain : ${{ env.CMAKE_TOOLCHAIN_FILE }}
555563 ref-source-dir : boost-root/libs/corosio/test/cmake_test
556564
557565 - name : Root Project CMake Workflow
@@ -574,9 +582,9 @@ jobs:
574582 shared : ${{ matrix.shared }}
575583 cmake-version : ' >=3.20'
576584 extra-args : |
577- ${{ runner.os == 'Windows' && format('-D CMAKE_TOOLCHAIN_FILE={0}/vcpkg/scripts/buildsystems/vcpkg.cmake', github.workspace) || '' }}
578585 ${{ runner.os == 'Linux' && format('-D WolfSSL_INCLUDE_DIR={0}', steps.vcpkg-paths-linux.outputs.wolfssl_include) || '' }}
579586 ${{ runner.os == 'Linux' && format('-D WolfSSL_LIBRARY={0}', steps.vcpkg-paths-linux.outputs.wolfssl_library) || '' }}
587+ toolchain : ${{ env.CMAKE_TOOLCHAIN_FILE }}
580588 package : false
581589 package-artifact : false
582590 ref-source-dir : boost-root
0 commit comments