Updates in hope to fix the CI build on Windows (3)
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 3bdf33b..29bb8ac 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml
@@ -40,26 +40,22 @@ uses: actions/cache@v4 with: path: ${{ env.VMA_VULKAN_SDK_PATH }} - key: vulkan-sdk-${{ env.VMA_VULKAN_VERSION }} + key: vulkan-sdk-${{ env.VMA_VULKAN_VERSION }}-installed - - name: Download Vulkan SDK + - name: Install Vulkan SDK if: steps.cache-vulkan.outputs.cache-hit != 'true' shell: pwsh run: | - if (-Not (Test-Path ${{ env.VMA_VULKAN_SDK_PATH }})) { - Write-Host "Vulkan SDK not found in cache. Downloading..." - curl -LS -o vulkansdk.exe https://sdk.lunarg.com/sdk/download/${{ env.VMA_VULKAN_VERSION }}/windows/vulkansdk-windows-X64-${{ env.VMA_VULKAN_VERSION }}.exe - 7z x vulkansdk.exe -o"${{ env.VMA_VULKAN_SDK_PATH }}" - } else { - Write-Host "Using cached Vulkan SDK" - } + Write-Host "Vulkan SDK not found in cache. Installing..." + curl -LS -o vulkansdk.exe https://sdk.lunarg.com/sdk/download/${{ env.VMA_VULKAN_VERSION }}/windows/vulkansdk-windows-X64-${{ env.VMA_VULKAN_VERSION }}.exe + .\vulkansdk.exe --root "${{ env.VMA_VULKAN_SDK_PATH }}" --accept-licenses --default-answer --confirm-command install copy_only=1 - name: Configure CMake shell: pwsh run: | $env:CC="${{ matrix.config.cc }}" $env:CXX="${{ matrix.config.cxx }}" - $env:Path += ";${{ env.VMA_VULKAN_SDK_PATH }}\;${{ env.VMA_VULKAN_SDK_PATH }}\Bin\" + $env:Path += ";${{ env.VMA_VULKAN_SDK_PATH }}\Bin\" $env:VULKAN_SDK="${{ env.VMA_VULKAN_SDK_PATH }}" cmake . ` -Bbuild `
diff --git a/src/Shaders/CompileShaders.bat b/src/Shaders/CompileShaders.bat index 5d9d815..0e0370e 100644 --- a/src/Shaders/CompileShaders.bat +++ b/src/Shaders/CompileShaders.bat
@@ -1,4 +1,4 @@ -%VULKAN_SDK%/Bin32/glslangValidator.exe -V -o ../../bin/Shader.vert.spv Shader.vert -%VULKAN_SDK%/Bin32/glslangValidator.exe -V -o ../../bin/Shader.frag.spv Shader.frag -%VULKAN_SDK%/Bin32/glslangValidator.exe -V -o ../../bin/SparseBindingTest.comp.spv SparseBindingTest.comp -pause +%VULKAN_SDK%/Bin/glslangValidator.exe -V -o ../../bin/Shader.vert.spv Shader.vert +%VULKAN_SDK%/Bin/glslangValidator.exe -V -o ../../bin/Shader.frag.spv Shader.frag +%VULKAN_SDK%/Bin/glslangValidator.exe -V -o ../../bin/SparseBindingTest.comp.spv SparseBindingTest.comp +pause