Skip to content

Commit ec9a975

Browse files
committed
WIP: Fix CI config
1 parent bc0b142 commit ec9a975

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

.github/workflows/build-release.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,19 +188,22 @@ jobs:
188188
- name: Download and unpack LLVM
189189
env:
190190
LLVM_VERSION: 22.1.8
191+
LLVM_PACKAGE_NAME: clang+llvm-22.1.8-x86_64-pc-windows-msvc
191192
run: |
192-
curl.exe -fLO "https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-pc-windows-msvc.tar.xz"
193-
tar -xf "clang+llvm-$LLVM_VERSION-x86_64-pc-windows-msvc.tar.xz"
194-
mv "clang+llvm-$LLVM_VERSION-x86_64-pc-windows-msvc" C:\clang+llvm
193+
curl.exe -fLO "https://github.com/llvm/llvm-project/releases/download/llvmorg-$env:LLVM_VERSION/$env:LLVM_PACKAGE_NAME.tar.xz"
194+
tar -xf "$env:LLVM_PACKAGE_NAME.tar.xz"
195+
mv "$env:LLVM_PACKAGE_NAME" C:\clang+llvm
195196
echo "C:\clang+llvm\bin" >> $env:GITHUB_PATH
196197
198+
# more info: https://github.com/jklappenbach/cajeta/commit/17811cfd922f0715c68eb3459cd153760bc890f8
197199
- name: Patch LLVM
198-
if: false
199200
shell: bash
200201
run: |
201-
# more info: https://github.com/jklappenbach/cajeta/commit/17811cfd922f0715c68eb3459cd153760bc890f8
202-
expected="C:/Program Files/Microsoft Visual Studio/2022/Enterprise/DIA SDK/lib/amd64/diaguids.lib"
203-
actual="C:/Program Files/Microsoft Visual Studio/18/Enterprise/DIA SDK/lib/amd64/diaguids.lib"
202+
# copy the actual Visual Studio location from here
203+
"/c/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" -products '*' -latest -property installationPath
204+
205+
expected="C:/Program Files/Microsoft Visual Studio/2022/Enterprise"
206+
actual="C:/Program Files/Microsoft Visual Studio/18/Enterprise"
204207
sed -i "s|${expected}|${actual}|" C:/clang+llvm/lib/cmake/llvm/LLVMExports.cmake
205208
206209
- name: Build

0 commit comments

Comments
 (0)