Merge pull request #604 from novelrt/misc/bump-vulkan-version-in-ci

Update macOS build to use newer vulkan
novelrt · Feb 13, 2025 · 9032dd4 · 9032dd4
2 parents 5ad1ba6 + ca5294e
commit 9032dd4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/build-system.yml b/.github/workflows/build-system.yml
@@ -17,7 +17,7 @@ jobs:
       matrix:
         configuration: [Debug, Release]
         os: [windows-latest, windows-2019, ubuntu-latest, macos-13, macos-14]
-        vulkanVersion: [1.3.231.1]
+        vulkanVersion: [1.3.290.0]
         include:
         - os: ubuntu-latest
           container: novelrt/novelrt-build:latest
@@ -43,15 +43,14 @@ jobs:
         id: cache-vulkan-macOS
         uses: actions/cache@v4
         with:
-          path: $GITHUB_WORKSPACE/VulkanSDK
-          key: ${{ runner.os }}-vulkansdk-${{ matrix.vulkanVersion }}-${{ hashFiles('**/mvk_vulkan.h') }}
-          restore-keys: |
-            ${{ runner.os }}-vulkansdk-${{ matrix.vulkanVersion}}-
+          path: ${{ github.workspace }}/VulkanSDK
+          key: ${{ runner.os }}-vulkansdk-${{ matrix.vulkanVersion }}-${{ hashFiles('${{ github.workspace}}/VulkanSDK/macOS/lib/libMoltenVK.dylib') }}
+          restore-keys: ${{ runner.os }}-vulkansdk-${{ matrix.vulkanVersion }}-
 
       - name: Install Vulkan SDK (macOS)
         if: "contains(matrix.os, 'macos') && steps.cache-vulkan-macOS.outputs.cache-hit != 'true'"
         id: install-vulkan-macOS
-        run: scripts/ci-apple-installVulkanSDK.sh ${{ matrix.vulkanVersion }} $GITHUB_WORKSPACE/VulkanSDK
+        run: scripts/ci-apple-installVulkanSDK.sh ${{ matrix.vulkanVersion }} ${{ github.workspace }}/VulkanSDK
 
       - name: Install Vulkan SDK (Windows)
         uses: humbletim/[email protected]

diff --git a/scripts/ci-apple-installVulkanSDK.sh b/scripts/ci-apple-installVulkanSDK.sh
@@ -41,15 +41,19 @@ else
                 echo "Could not find libvulkan.dylib!"
                 exit -1
             fi
-            if test -f $sdk_path/$version/MoltenVK/dylib/macOS/libMoltenVK.dylib; then
+            if test -f $sdk_path/$version/macOS/lib/libMoltenVK.dylib; then
                 echo "Found MoltenVK!"
             else
-                echo "Could not find MoltenVK!"
-                exit -1
+                if test -f $sdk_path/$version/MoltenVK/dylib/macOS/libMoltenVK.dylib; then
+                    echo "Found MoltenVK in legacy path!"
+                else
+                    echo "Could not find MoltenVK!"
+                    exit -1
+                fi
             fi
         else
             echo "Could not download Vulkan SDK! Check curl output for more information."
             exit -1
         fi
     fi
-fi
+fi