From 87ca8c45db04f9ea1051640067e99d01563fca64 Mon Sep 17 00:00:00 2001 From: Tzanko Matev Date: Mon, 4 Aug 2025 16:28:02 +0300 Subject: [PATCH 1/2] ci: install msys2 toolchain on windows Install MSYS2/MinGW and capnproto on Windows runners, drop LLVM/vcpkg setup, and add msys64 paths and clang variables to the environment. --- .github/workflows/ci.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 067efb5..314a64d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,16 +29,13 @@ jobs: elif [[ "$RUNNER_OS" == "macOS" ]]; then brew install capnp pkg-config elif [[ "$RUNNER_OS" == "Windows" ]]; then - # Install LLVM/Clang for Windows - choco install llvm -y - # Install vcpkg for Cap'n Proto on Windows - git clone https://github.com/Microsoft/vcpkg.git - cd vcpkg - ./bootstrap-vcpkg.bat - ./vcpkg install capnproto:x64-windows - echo "VCPKG_ROOT=$(pwd)" >> $GITHUB_ENV - echo "CMAKE_TOOLCHAIN_FILE=$(pwd)/scripts/buildsystems/vcpkg.cmake" >> $GITHUB_ENV - cd .. + # Install MSYS2 and required packages + choco install msys2 -y + C:/msys64/usr/bin/bash -lc "pacman -S --noconfirm mingw-w64-x86_64-clang capnproto" + # Ensure MSYS2 toolchain is used for builds + echo 'C:\msys64\mingw64\bin' >> $GITHUB_PATH + echo 'LIBCLANG_PATH=C:\msys64\mingw64\lib' >> $GITHUB_ENV + echo 'CLANG_PATH=C:\msys64\mingw64\bin\clang' >> $GITHUB_ENV fi - name: Setup Ruby uses: ruby/setup-ruby@v1 From a37452f1ff6229c3e15cee3a39fec1e62306896e Mon Sep 17 00:00:00 2001 From: Tzanko Matev Date: Mon, 4 Aug 2025 16:39:19 +0300 Subject: [PATCH 2/2] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 314a64d..6e24976 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: elif [[ "$RUNNER_OS" == "Windows" ]]; then # Install MSYS2 and required packages choco install msys2 -y - C:/msys64/usr/bin/bash -lc "pacman -S --noconfirm mingw-w64-x86_64-clang capnproto" + C:/msys64/usr/bin/bash -lc "pacman -S --noconfirm mingw-w64-x86_64-clang mingw-w64-x86_64-capnproto" # Ensure MSYS2 toolchain is used for builds echo 'C:\msys64\mingw64\bin' >> $GITHUB_PATH echo 'LIBCLANG_PATH=C:\msys64\mingw64\lib' >> $GITHUB_ENV