Skip to content

Commit 70fedf8

Browse files
committed
fix(CI): don't install clang; install capnproto via the MSYS2 gcc environment, distributed with Ruby for Windows
1 parent a0a4c10 commit 70fedf8

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ jobs:
3030
brew install capnp pkg-config
3131
elif [[ "$RUNNER_OS" == "Windows" ]]; then
3232
# Install LLVM/Clang for Windows
33-
choco install llvm -y
33+
#choco install llvm -y
3434
# 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 ..
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 ..
4242
fi
4343
- name: Setup Ruby
4444
uses: ruby/setup-ruby@v1
@@ -56,7 +56,8 @@ jobs:
5656
shell: bash
5757
run: |
5858
if [[ "$RUNNER_OS" == "Windows" ]]; then
59-
ridk enable
59+
pacman -S mingw-w64-ucrt-x86_64-capnproto
60+
# ridk enable
6061
fi
6162
just build-extension
6263
- name: Run tests

0 commit comments

Comments
 (0)