Skip to content

Commit 910f884

Browse files
committed
fix: switch Windows CI to MSVC + install LLVM to fix 0xc000007b and build size
1 parent 39e29aa commit 910f884

1 file changed

Lines changed: 13 additions & 9 deletions

File tree

.github/workflows/build.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,12 @@ jobs:
4949
brew install llvm
5050
echo "CMAKE_PREFIX_PATH=$(brew --prefix llvm)" >> $GITHUB_ENV
5151
52-
- name: Install Ninja (Windows)
52+
- name: Install LLVM (Windows)
5353
if: matrix.os == 'windows-latest'
54-
run: choco install ninja -y
54+
shell: pwsh
55+
run: |
56+
choco install llvm --version=17.0.6 -y
57+
echo "LLVM_DIR=C:\Program Files\LLVM\lib\cmake\llvm" >> $env:GITHUB_ENV
5558
5659
5760
- name: Configure (Unix)
@@ -68,7 +71,8 @@ jobs:
6871
shell: pwsh
6972
run: |
7073
cmake -S . -B build `
71-
-G "Ninja" `
74+
-G "Visual Studio 17 2022" -A x64 `
75+
-DLLVM_DIR="$env:LLVM_DIR" `
7276
-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
7377
-DBUILD_TESTS=OFF `
7478
-DBUILD_BENCH=OFF
@@ -81,7 +85,7 @@ jobs:
8185
shell: bash
8286
run: |
8387
if [ "${{ matrix.os }}" == "windows-latest" ]; then
84-
EXE_PATH="build/proxpl.exe"
88+
EXE_PATH="build/Release/proxpl.exe"
8589
else
8690
EXE_PATH="build/proxpl"
8791
fi
@@ -95,11 +99,11 @@ jobs:
9599
run: |
96100
choco install innosetup -y
97101
New-Item -ItemType Directory -Force -Path bin
98-
Copy-Item "build/proxpl.exe" -Destination "bin/"
99-
Copy-Item "build/prm.exe" -Destination "bin/"
100-
if (Test-Path "build/proxpl_lib.dll") {
101-
Copy-Item "build/proxpl_lib.dll" -Destination "bin/"
102-
}
102+
# Visual Studio puts Release binaries in build/Release/
103+
Copy-Item "build/Release/proxpl.exe" -Destination "bin/"
104+
Copy-Item "build/Release/prm.exe" -Destination "bin/"
105+
# Copy any DLLs produced by the build (e.g. LLVM shared libs)
106+
Get-ChildItem "build/Release/*.dll" -ErrorAction SilentlyContinue | Copy-Item -Destination "bin/"
103107
iscc setup.iss
104108
105109
- name: Upload Artifact

0 commit comments

Comments
 (0)