GHA: Fix Vulkan in CI

limbonaut · Feb 11, 2025 · 52cae64 · 52cae64
1 parent efcd948
commit 52cae64
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -168,10 +168,12 @@ jobs:
           # ! Note: Vulkan SDK changed packaging, so we need to inline these steps for the time being.
           #sh misc/scripts/install_vulkan_sdk_macos.sh
 
+          curl -L "https://sdk.lunarg.com/sdk/download/latest/mac/config.json" -o /tmp/vulkan-sdk.json
+          sdk_version=`jq -r '.version' /tmp/vulkan-sdk.json`
           curl -L "https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.zip" -o /tmp/vulkan-sdk.zip
           unzip /tmp/vulkan-sdk.zip -d /tmp
-          /tmp/InstallVulkan.app/Contents/MacOS/InstallVulkan --accept-licenses --default-answer --confirm-command install
-          rm -Rf /tmp/InstallVulkan.app
+          /tmp/InstallVulkan-${sdk_version}.app/Contents/MacOS/InstallVulkan-${sdk_version} --accept-licenses --default-answer --confirm-command install
+          rm -Rf /tmp/InstallVulkan-${sdk_version}.app
           rm -f /tmp/vulkan-sdk.zip
 
       - name: Set up scons cache

diff --git a/gdextension/limboai.gdextension b/gdextension/limboai.gdextension
@@ -25,10 +25,10 @@ android.debug.x86_64 = "res://addons/limboai/bin/liblimboai.android.editor.x86_6
 android.release.x86_64 = "res://addons/limboai/bin/liblimboai.android.template_release.x86_64.so"
 android.debug.x86_32 = "res://addons/limboai/bin/liblimboai.android.editor.x86_32.so"
 android.release.x86_32 = "res://addons/limboai/bin/liblimboai.android.template_release.x86_32.so"
-ios.release.arm64 = "res://addons/limboai/bin/liblimboai.ios.template_release.arm64.dylib"
 ios.debug.arm64 = "res://addons/limboai/bin/liblimboai.ios.template_debug.arm64.dylib"
-ios.release.simulator = "res://addons/limboai/bin/liblimboai.ios.template_release.universal.dylib"
+ios.release.arm64 = "res://addons/limboai/bin/liblimboai.ios.template_release.arm64.dylib"
 ios.debug.simulator = "res://addons/limboai/bin/liblimboai.ios.template_debug.universal.dylib"
+ios.release.simulator = "res://addons/limboai/bin/liblimboai.ios.template_release.universal.dylib"
 web.debug.wasm32 = "res://addons/limboai/bin/liblimboai.web.template_debug.wasm32.wasm"
 web.release.wasm32 = "res://addons/limboai/bin/liblimboai.web.template_release.wasm32.wasm"