CI: install vulkan sdk for windows

PadWorld-Entertainment · Jan 9, 2023 · 170da7a · 170da7a
1 parent 3ed27c2
commit 170da7a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,13 +8,14 @@ name: "Build"
 
 jobs:
   build-cmake:
-    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.platform.name }}
+    runs-on: ${{ matrix.platform.os }}
     strategy:
       matrix:
-        os:
-          - ubuntu-20.04
-          - windows-2019
-          - macos-10.15
+        platform:
+        - { name: Ubuntu,  os: ubuntu-20.04 }
+        - { name: Windows, os: windows-2019, env_var: 'env VULKAN_SDK=C:\Vulkan\1.2.182.0' }
+        - { name: MacOS,   os: macos-10.15 }
 
     steps:
       - name: "Checkout"
@@ -29,14 +30,15 @@ jobs:
       - name: "Install Dependencies (OSX)"
         if: ${{ runner.os == 'macOS' }}
         run: |
-          brew install sdl2 glslang molten-vk vulkan-headers
+          HOMEBREW_NO_AUTO_UPDATE=1 brew install sdl2 glslang molten-vk vulkan-headers
 
       - name: "Install Dependencies (Windows)"
         if: ${{ runner.os == 'Windows' }}
         run: choco install zip vulkan-sdk
 
       - name: "Compile"
         run: |
+          ${{ matrix.platform.env_var }}
           mkdir build
           cd build
           cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
@@ -306,7 +306,7 @@ endif()
 if (BUILD_RENDERER_VULKAN)
 	find_package(Vulkan)
 	if (NOT Vulkan_FOUND)
-		message(WARNING "Vulkan not found - skipping renderer")
+		message(WARNING "Vulkan not found - skipping renderer: '$ENV{VULKAN_SDK}'")
 	elseif (NOT Vulkan_glslangValidator_FOUND)
 		message(WARNING "vulkan glslangValidator not found - skipping renderer")
 	else()