Download full target build of llvm in CI Windows runners to fix missing MIPS support and update N64Recomp CI commit

This commit is contained in:
Mr-Wiseguy 2025-03-05 22:17:50 -05:00
parent b706f3fc2e
commit 1be70b95bd
3 changed files with 11 additions and 4 deletions

View File

@ -9,7 +9,7 @@ on:
N64RECOMP_COMMIT:
type: string
required: false
default: 'be65d37760e56867fc5ac68510ffdc0f6e00bbb5'
default: '989a86b36912403cd323de884bf834f2605ea770'
DXC_CHECKSUM:
type: string
required: false
@ -215,6 +215,13 @@ jobs:
run: |
choco install ninja
Remove-Item -Path "C:\ProgramData\Chocolatey\bin\ccache.exe" -Force -ErrorAction SilentlyContinue
- name: Download portable LLVM
run: |
$ProgressPreference = 'SilentlyContinue'
Invoke-WebRequest -Uri "https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.3/LLVM-19.1.3-Windows-X64.tar.xz" -OutFile "LLVM.tar.xz"
New-Item -ItemType Directory -Path portable-llvm > $null
7z x LLVM.tar.xz
7z x LLVM.tar -oportable-llvm
- name: Configure Developer Command Prompt
uses: ilammy/msvc-dev-cmd@v1
- name: Prepare Build
@ -254,7 +261,7 @@ jobs:
# remove LLVM from PATH so it doesn't overshadow the one provided by VS
$env:PATH = ($env:PATH -split ';' | Where-Object { $_ -ne 'C:\Program Files\LLVM\bin' }) -join ';'
cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DCMAKE_MAKE_PROGRAM=ninja -G Ninja -S . -B cmake-build -DCMAKE_CXX_FLAGS="-Xclang -fexceptions -Xclang -fcxx-exceptions"
cmake -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DCMAKE_MAKE_PROGRAM=ninja -DPATCHES_C_COMPILER="..\portable-llvm\LLVM-19.1.3-Windows-X64\bin\clang" -DPATCHES_LD="..\portable-llvm\LLVM-19.1.3-Windows-X64\bin\ld.lld" -G Ninja -S . -B cmake-build -DCMAKE_CXX_FLAGS="-Xclang -fexceptions -Xclang -fcxx-exceptions"
cmake --build cmake-build --config ${{ matrix.type }} --target Zelda64Recompiled -j $cpuCores
env:
SDL2_VERSION: ${{ inputs.SDL2_VERSION }}

@ -1 +1 @@
Subproject commit 4c7acc6eb11a662e6024105ace37242584b977f2
Subproject commit 0ff3d0ee3f9f13fba533ac3951370d4ee64f3989

@ -1 +1 @@
Subproject commit 1db8c347caa9dd356050777ac79a81f1ccfa462b
Subproject commit 3d80ce9d06f1395279938a9d4502d812a0fb3402