From ecd8231dee0d6cce6c446b6c8f20050825a773ad Mon Sep 17 00:00:00 2001
From: Luke Street <luke@street.dev>
Date: Tue, 11 Nov 2025 23:35:14 -0700
Subject: [PATCH] ci: Test on macos-15-intel

---
 .github/workflows/ci.yml             | 9 ++++++++-
 cmake/toolchains/x86_64-darwin.cmake | 2 +-
 dll/kernel32/libloaderapi.cpp        | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6561b51..a56290a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -150,19 +150,25 @@ jobs:
 
   build-macos:
     name: Build macOS ${{ matrix.display }}
-    runs-on: macos-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         include:
           - id: macos-debug
+            os: macos-latest
             display: Debug
             preset: debug-macos
             build_dir: debug
           - id: macos-release
+            os: macos-latest
             display: Release
             preset: release-macos
             build_dir: release
+          # For testing only
+          - os: macos-15-intel
+            display: Release (Intel)
+            preset: release-macos
     steps:
       - name: Install dependencies
         run: |
@@ -183,6 +189,7 @@ jobs:
 
       - name: Upload artifact
         uses: actions/upload-artifact@v5
+        if: ${{ matrix.id }}
         with:
           name: ${{ matrix.id }}
           path: build/${{ matrix.build_dir }}/wibo
diff --git a/cmake/toolchains/x86_64-darwin.cmake b/cmake/toolchains/x86_64-darwin.cmake
index 9829948..1cb242a 100644
--- a/cmake/toolchains/x86_64-darwin.cmake
+++ b/cmake/toolchains/x86_64-darwin.cmake
@@ -10,7 +10,7 @@ set(CMAKE_ASM_COMPILER_TARGET ${TARGET})
 
 # Force x86_64 architecture
 set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build architecture for macOS" FORCE)
-set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Minimum macOS deployment version" FORCE)
+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum macOS deployment version" FORCE)
 
 # Search for programs in the build host directories
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
diff --git a/dll/kernel32/libloaderapi.cpp b/dll/kernel32/libloaderapi.cpp
index 1b1f966..dfc2e08 100644
--- a/dll/kernel32/libloaderapi.cpp
+++ b/dll/kernel32/libloaderapi.cpp
@@ -205,7 +205,7 @@ HGLOBAL WINAPI LoadResource(HMODULE hModule, HRSRC hResInfo) {
 
 LPVOID WINAPI LockResource(HGLOBAL hResData) {
 	HOST_CONTEXT_GUARD();
-	DEBUG_LOG("LockResource(%p)\n", hResData);
+	DEBUG_LOG("STUB: LockResource(%p)\n", hResData);
 	return fromGuestPtr(hResData);
 }