diff --git a/.github/actions/prepare-runner/action.yaml b/.github/actions/prepare-runner/action.yaml index a79e8d1..7f839ec 100644 --- a/.github/actions/prepare-runner/action.yaml +++ b/.github/actions/prepare-runner/action.yaml @@ -79,17 +79,30 @@ runs: - name: Install Vulkan SDK uses: humbletim/setup-vulkan-sdk@v1.2.0 + if: runner.os == 'Linux' || runner.os == 'Windows' with: vulkan-query-version: 1.3.204.0 vulkan-components: Vulkan-Headers, Vulkan-Loader vulkan-use-cache: true - - name: Install MoltenVK + - name: Install Vulkan SDK shell: bash if: runner.os == 'macOS' run: | - brew update - brew install molten-vk + wget https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.dmg + hdiutil attach vulkan-sdk.dmg -mountpoint vulkan-sdk + export VULKAN_SDK="${HOME}/VulkanSDK" + sudo ./vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan \ + --root "${VULKAN_SDK}" \ + --accept-licenses \ + --default-answer \ + --confirm-command install + + echo VULKAN_SDK="${VULKAN_SDK}" >> "${GITHUB_ENV}" + echo DYLD_LIBRARY_PATH="$VULKAN_SDK/lib:$DYLD_LIBRARY_PATH" >> "${GITHUB_ENV}" + echo VK_ICD_FILENAMES="$VULKAN_SDK/etc/vulkan/icd.d/MoltenVK_icd.json" >> "${GITHUB_ENV}" + echo VK_LAYER_PATH="$VULKAN_SDK/share/vulkan/explicit_layer.d" >> "${GITHUB_ENV}" + echo "$VULKAN_SDK/bin" >> "${GITHUB_PATH}" - name: Checkout 3rd-party uses: ./.github/actions/checkout