Skip to content

Commit d0bcb69

Browse files
committed
Attempt to detect the installer layout on Mac
1 parent e3c2f70 commit d0bcb69

1 file changed

Lines changed: 15 additions & 2 deletions

File tree

action.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,21 @@ runs:
3838
mkdir -p "$RUNNER_TOOL_CACHE/vulkan/$sdkVersion"
3939
mkdir -p "$RUNNER_TEMP/vulkan_sdk"
4040
ditto -xk "$RUNNER_TEMP/vulkan_sdk.zip" "$RUNNER_TEMP/vulkan_sdk"
41-
appRoot="$RUNNER_TEMP/vulkan_sdk/vulkansdk-macOS-$sdkVersion.app"
42-
installer="$appRoot/Contents/MacOS/vulkansdk-macOS-$sdkVersion"
41+
42+
installer=""
43+
if [[ -d "$RUNNER_TEMP/vulkan_sdk/InstallVulkan.app" ]]; then
44+
# This version uses the "old" SDK installer layout
45+
appRoot="$RUNNER_TEMP/vulkan_sdk/InstallVulkan.app"
46+
installer="$appRoot/Contents/MacOS/InstallVulkan"
47+
elif [[ -d "$RUNNER_TEMP/vulkan_sdk/vulkansdk-macOS-$sdkVersion.app" ]]; then
48+
# This version uses the "new" SDK installer layout
49+
appRoot="$RUNNER_TEMP/vulkan_sdk/vulkansdk-macOS-$sdkVersion.app"
50+
installer="$appRoot/Contents/MacOS/vulkansdk-macOS-$sdkVersion"
51+
else
52+
echo "::error::Failed to determine Vulkan SDK installer layout"
53+
echo "unknown SDK layout" && exit 1
54+
fi
55+
4356
$installer --root "$RUNNER_TOOL_CACHE/vulkan/$sdkVersion" --accept-licenses --default-answer --auto-answer OverwriteTargetDirectory=Yes --confirm-command install copy_only=1
4457
shell: bash
4558
if: ${{ steps.cache-restore.outputs.cache-hit != 'true' && runner.os == 'macOS' }}

0 commit comments

Comments
 (0)