fix Vulkan

Author: Eatgrapes

.github/workflows/build.yml

@@ -27,15 +27,29 @@ jobs:
 
       - name: Install Dependencies (Linux)
         if: contains(matrix.os, 'ubuntu')
-        run: sudo apt-get install -y libgles2-mesa-dev glslang-tools
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgles2-mesa-dev glslang-tools
 
       - name: Install Dependencies (macOS)
         if: contains(matrix.os, 'macos')
         run: brew install glslang
 
       - name: Install Dependencies (Windows)
         if: contains(matrix.os, 'windows')
-        run: choco install glslang -y
+        shell: pwsh
+        run: |
+          $ErrorActionPreference = 'Continue'
+          choco install vulkan-sdk -y
+          if ($LASTEXITCODE -ne 0) {
+            Write-Host "Chocolatey install failed, falling back to winget..."
+            winget install --id KhronosGroup.VulkanSDK --accept-package-agreements --accept-source-agreements --disable-interactivity
+          }
+          $ErrorActionPreference = 'Stop'
+          $sdkDir = Get-ChildItem 'C:\VulkanSDK' -Directory | Sort-Object Name -Descending | Select-Object -First 1
+          if (-not $sdkDir) { throw "Vulkan SDK not found under C:\VulkanSDK" }
+          "$($sdkDir.FullName)\Bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          glslangValidator --version
 
       - name: Build Desktop
         run: python3 scripts/build.py desktop
@@ -70,7 +84,9 @@ jobs:
           ndk-version: r26b
 
       - name: Install Vulkan Shader Compiler
-        run: sudo apt-get install -y glslang-tools
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y glslang-tools
 
       - name: Build Android
         run: python3 scripts/build.py android

.github/workflows/release.yml

@@ -37,15 +37,29 @@ jobs:
 
       - name: Install Dependencies (Linux)
         if: contains(matrix.os, 'ubuntu')
-        run: sudo apt-get install -y libgles2-mesa-dev glslang-tools
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgles2-mesa-dev glslang-tools
 
       - name: Install Dependencies (macOS)
         if: contains(matrix.os, 'macos')
         run: brew install glslang
 
       - name: Install Dependencies (Windows)
         if: contains(matrix.os, 'windows')
-        run: choco install glslang -y
+        shell: pwsh
+        run: |
+          $ErrorActionPreference = 'Continue'
+          choco install vulkan-sdk -y
+          if ($LASTEXITCODE -ne 0) {
+            Write-Host "Chocolatey install failed, falling back to winget..."
+            winget install --id KhronosGroup.VulkanSDK --accept-package-agreements --accept-source-agreements --disable-interactivity
+          }
+          $ErrorActionPreference = 'Stop'
+          $sdkDir = Get-ChildItem 'C:\VulkanSDK' -Directory | Sort-Object Name -Descending | Select-Object -First 1
+          if (-not $sdkDir) { throw "Vulkan SDK not found under C:\VulkanSDK" }
+          "$($sdkDir.FullName)\Bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          glslangValidator --version
 
       - name: Build Desktop
         run: python3 scripts/build.py desktop
@@ -79,7 +93,9 @@ jobs:
           ndk-version: r26b
 
       - name: Install Vulkan Shader Compiler
-        run: sudo apt-get install -y glslang-tools
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y glslang-tools
 
       - name: Build Android
         run: python3 scripts/build.py android