From 84647d2a97e34f184c8c40d8ebee0aa1457f7c57 Mon Sep 17 00:00:00 2001 From: Justin Kim Date: Mon, 29 Jun 2026 19:03:23 +0900 Subject: [PATCH] ci: put vcpkg bin on PATH so Windows tests find the glib DLL libwiig links glib-2.0 and the test binaries (test_skeleton via wiig_dep, test_lexer directly) pull it in too. The vcpkg x64-windows triplet ships glib as a DLL, so the test executables need glib-2.0-0.dll and its dependencies on PATH at run time; without it the test step dies with a missing-DLL load failure before any assertion runs. Prepend %VCPKG_INSTALLED_DIR%\bin to PATH in the configure and build/test steps of both Windows jobs, matching the proven clang-cl + vcpkg setup used by the sibling glib-on-Windows project. The compiler stays clang-cl: pure MSVC cl cannot build the glib headers, so the MSVC-ABI-via-clang path is the supported one here. --- .github/workflows/ci-main.yml | 2 ++ .github/workflows/ci-pr.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index 87b834c..0c36f6e 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -185,6 +185,7 @@ jobs: @echo off call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" set PKG_CONFIG_PATH=%VCPKG_INSTALLED_DIR%\lib\pkgconfig + set PATH=%VCPKG_INSTALLED_DIR%\bin;%PATH% set CC=clang-cl meson setup builddir -Ddefault_library=static -Dwerror=true @@ -193,6 +194,7 @@ jobs: run: | @echo off call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + set PATH=%VCPKG_INSTALLED_DIR%\bin;%PATH% meson test -C builddir --print-errorlogs --suite unit - name: Upload meson logs on failure diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 7400a44..588e343 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -138,6 +138,7 @@ jobs: @echo off call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" set PKG_CONFIG_PATH=%VCPKG_INSTALLED_DIR%\lib\pkgconfig + set PATH=%VCPKG_INSTALLED_DIR%\bin;%PATH% set CC=clang-cl meson setup builddir -Ddefault_library=static -Dwerror=true @@ -146,6 +147,7 @@ jobs: run: | @echo off call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" + set PATH=%VCPKG_INSTALLED_DIR%\bin;%PATH% meson test -C builddir --print-errorlogs --suite unit - name: Upload meson logs on failure