Skip to content

Commit 87ca8c4

Browse files
committed
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.
1 parent 69000ed commit 87ca8c4

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,13 @@ jobs:
2929
elif [[ "$RUNNER_OS" == "macOS" ]]; then
3030
brew install capnp pkg-config
3131
elif [[ "$RUNNER_OS" == "Windows" ]]; then
32-
# Install LLVM/Clang for Windows
33-
choco install llvm -y
34-
# Install vcpkg for Cap'n Proto on Windows
35-
git clone https://github.com/Microsoft/vcpkg.git
36-
cd vcpkg
37-
./bootstrap-vcpkg.bat
38-
./vcpkg install capnproto:x64-windows
39-
echo "VCPKG_ROOT=$(pwd)" >> $GITHUB_ENV
40-
echo "CMAKE_TOOLCHAIN_FILE=$(pwd)/scripts/buildsystems/vcpkg.cmake" >> $GITHUB_ENV
41-
cd ..
32+
# Install MSYS2 and required packages
33+
choco install msys2 -y
34+
C:/msys64/usr/bin/bash -lc "pacman -S --noconfirm mingw-w64-x86_64-clang capnproto"
35+
# Ensure MSYS2 toolchain is used for builds
36+
echo 'C:\msys64\mingw64\bin' >> $GITHUB_PATH
37+
echo 'LIBCLANG_PATH=C:\msys64\mingw64\lib' >> $GITHUB_ENV
38+
echo 'CLANG_PATH=C:\msys64\mingw64\bin\clang' >> $GITHUB_ENV
4239
fi
4340
- name: Setup Ruby
4441
uses: ruby/setup-ruby@v1

0 commit comments

Comments
 (0)