@@ -346,21 +346,25 @@ jobs:
346346 sudo apt-get update -y
347347 sudo apt-get install -y build-essential vulkan-sdk
348348
349+ # - name: Prepare Vulkan SDK Windows
350+ # if: ${{ matrix.vulkan && (matrix.os == 'win') }}
351+ # # continue-on-error: true
352+ # run: |
353+ # curl.exe -o $env:RUNNER_TEMP/VulkanSDK-Installer.exe -L "https://sdk.lunarg.com/sdk/download/${env:VULKAN_VERSION}/windows/VulkanSDK-${env:VULKAN_VERSION}-Installer.exe"
354+ # Add-Content $env:GITHUB_ENV "VULKAN_SDK=C:\VulkanSDK\${env:VULKAN_VERSION}"
355+ # Add-Content $env:GITHUB_PATH "C:\VulkanSDK\${env:VULKAN_VERSION}\bin"
356+
349357 - name : Prepare Vulkan SDK Windows
350- if : ${{ matrix.vulkan && (matrix.os == 'win') }}
351- # continue-on-error: true
352- run : |
353- curl.exe -o $env:RUNNER_TEMP/VulkanSDK-Installer.exe -L "https://sdk.lunarg.com/sdk/download/${env:VULKAN_VERSION}/windows/VulkanSDK-${env:VULKAN_VERSION}-Installer.exe"
354- & "$env:RUNNER_TEMP\VulkanSDK-Installer.exe" --accept-licenses --default-answer --confirm-command install
355- Add-Content $env:GITHUB_ENV "VULKAN_SDK=C:\VulkanSDK\${env:VULKAN_VERSION}"
356- Add-Content $env:GITHUB_PATH "C:\VulkanSDK\${env:VULKAN_VERSION}\bin"
357- - name : Debug Vulkan SDK env
358- if : ${{ matrix.vulkan && runner.os == 'win' }}
359- run : |
360- echo "VULKAN_SDK=$env:VULKAN_SDK"
361- dir "C:\VulkanSDK\1.3.261.1\Include\vulkan"
362- where glslc
358+ if : ${{ matrix.vulkan && matrix.os == 'win' }}
363359 shell : pwsh
360+ run : |
361+ $version = "${{ env.VULKAN_VERSION }}"
362+ $url = "https://sdk.lunarg.com/sdk/download/$version/windows/VulkanSDK-$version-Installer.exe"
363+ $installer = "$env:RUNNER_TEMP\VulkanSDK-Installer.exe"
364+ Invoke-WebRequest -Uri $url -OutFile $installer
365+ Start-Process -FilePath $installer -ArgumentList "--accept-licenses", "--default-answer", "--confirm-command", "install" -Wait
366+ Add-Content $env:GITHUB_ENV "VULKAN_SDK=C:\VulkanSDK\$version"
367+ Add-Content $env:GITHUB_PATH "C:\VulkanSDK\$version\Bin"
364368
365369 - name : Get Cer for code signing
366370 if : runner.os == 'macOS'
0 commit comments