From b7287de5a77de05e7ddced0edf6c0a3efc715e8d Mon Sep 17 00:00:00 2001 From: Wojciech Figat Date: Mon, 17 Jan 2022 14:09:06 +0100 Subject: [PATCH] Tweaks 1 --- .github/actions/vulkan/action.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/actions/vulkan/action.yml b/.github/actions/vulkan/action.yml index d12466c1a..b30e60599 100644 --- a/.github/actions/vulkan/action.yml +++ b/.github/actions/vulkan/action.yml @@ -16,22 +16,21 @@ runs: echo "Downloading Vulkan SDK version $VULKAN_SDK_VER" case `uname -s` in Linux) - export VULKAN_SDK_ROOT=`pwd`/VulkanSDK + export VULKAN_SDK_ROOT=`pwd`/../VulkanSDK wget "https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/linux/vulkan-sdk.tar.gz" --no-verbose -O vulkan-sdk.tar.gz mkdir $VULKAN_SDK_ROOT tar -xf vulkan-sdk.tar.gz -C $VULKAN_SDK_ROOT echo VULKAN_SDK=$VULKAN_SDK_ROOT/$VULKAN_SDK_VER/x86_64 >> $GITHUB_ENV ;; Darwin) - export VULKAN_SDK_ROOT=`pwd`/VulkanSDK + export VULKAN_SDK_ROOT=`pwd`/../VulkanSDK curl -LO "https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/mac/vulkan-sdk.dmg" hdiutil attach vulkan-sdk.dmg -mountpoint /Volumes/vulkan-sdk sudo "/Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan" --root $VULKAN_SDK_ROOT --accept-licenses --default-answer --confirm-command install echo VULKAN_SDK=$VULKAN_SDK_ROOT/macOS >> $GITHUB_ENV ;; *) # Windows - $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -Uri "https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/windows/VulkanSDK-$VULKAN_SDK_VER-Installer.exe" -OutFile vulkan-sdk.exe + curl -L "https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/windows/VulkanSDK-$VULKAN_SDK_VER-Installer.exe" -o vulkan-sdk.exe .\vulkan-sdk.exe --root C:\VulkanSDK --accept-licenses --default-answer --confirm-command install echo VULKAN_SDK=C:\VulkanSDK >> $GITHUB_ENV ;;