From 526fa5a33d4fb166c55847f4ffe9847b185092a1 Mon Sep 17 00:00:00 2001
From: Wojciech Figat <wojtek@figat.pl>
Date: Mon, 17 Jan 2022 12:30:03 +0100
Subject: [PATCH] Tweaks for CI

---
 .github/workflows/build_linux.yml             | 27 +++++++++----------
 .github/workflows/build_mac.yml               |  2 +-
 .../Vulkan/GraphicsDeviceVulkan.Build.cs      |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 3478d18ed..02dbc7877 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -1,6 +1,9 @@
 name: Build Linux
 on: [push, pull_request]
 
+env:
+  VULKAN_SDK_VER: 1.2.198.1
+
 jobs:
 
   # Editor
@@ -8,6 +11,8 @@ jobs:
     name: Editor (Linux, Development x64)
     runs-on: "ubuntu-20.04"
     steps:
+    - name: Checkout repo
+      uses: actions/checkout@v2
     - name: Install dependencies
       run: |
         sudo rm -f /etc/apt/sources.list.d/*
@@ -16,14 +21,10 @@ jobs:
         sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
     - name: Setup Vulkan
       run: |
-        wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
-        sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-focal.list http://packages.lunarg.com/vulkan/lunarg-vulkan-focal.list
-        sudo apt update
-        sudo apt install vulkan-sdk
-        apt list vulkan-sdk
+        wget "https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/linux/vulkan-sdk.tar.gz" -O vulkan-sdk.tar.gz
+        tar -xf vulkan-sdk.tar.gz
+        export VULKAN_SDK=`pwd`/$VULKAN_SDK_VER/x86_64
         echo Vulkan SDK installed!
-    - name: Checkout repo
-      uses: actions/checkout@v2
     - name: Checkout LFS
       run: |
         git lfs version
@@ -37,19 +38,17 @@ jobs:
     name: Game (Linux, Release x64)
     runs-on: "ubuntu-20.04"
     steps:
+    - name: Checkout repo
+      uses: actions/checkout@v2
     - name: Install dependencies
       run: |
         sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev
     - name: Setup Vulkan
       run: |
-        wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
-        sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-focal.list http://packages.lunarg.com/vulkan/lunarg-vulkan-focal.list
-        sudo apt update
-        sudo apt install vulkan-sdk
-        apt list vulkan-sdk
+        wget "https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VER/linux/vulkan-sdk.tar.gz" -O vulkan-sdk.tar.gz
+        tar -xf vulkan-sdk.tar.gz
+        export VULKAN_SDK=`pwd`/$VULKAN_SDK_VER/x86_64
         echo Vulkan SDK installed!
-    - name: Checkout repo
-      uses: actions/checkout@v2
     - name: Checkout LFS
       run: |
         git lfs version
diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml
index af42c14e1..0005d5133 100644
--- a/.github/workflows/build_mac.yml
+++ b/.github/workflows/build_mac.yml
@@ -2,7 +2,7 @@ name: Build macOS
 on: [push, pull_request]
 
 env:
-  VULKAN_SDK: $HOME/VulkanSDK
+  VULKAN_SDK: /Users/runner/VulkanSDK
 
 jobs:
 
diff --git a/Source/Engine/GraphicsDevice/Vulkan/GraphicsDeviceVulkan.Build.cs b/Source/Engine/GraphicsDevice/Vulkan/GraphicsDeviceVulkan.Build.cs
index fe9b60ca6..648e61f67 100644
--- a/Source/Engine/GraphicsDevice/Vulkan/GraphicsDeviceVulkan.Build.cs
+++ b/Source/Engine/GraphicsDevice/Vulkan/GraphicsDeviceVulkan.Build.cs
@@ -40,7 +40,7 @@ public sealed class VulkanSdk : Sdk
             return;
 
         var vulkanSdk = Environment.GetEnvironmentVariable("VULKAN_SDK");
-        if (vulkanSdk == null && platform == TargetPlatform.Mac)
+        if (platform == TargetPlatform.Mac && (vulkanSdk == null || !Directory.Exists(vulkanSdk)))
         {
             // Try to guess install location for the current user
             var path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "VulkanSDK");