Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 1a4e562

Browse files
authored
Merge pull request #77 from JSKitty/master
Try vcpkg instead
2 parents 80a2168 + c9b2c02 commit 1a4e562

1 file changed

Lines changed: 17 additions & 19 deletions

File tree

.github/workflows/publish.yaml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -50,29 +50,27 @@ jobs:
5050
sudo apt-get update
5151
sudo apt-get install -y vulkan-sdk
5252
53-
- name: Setup Vulkan SDK (Windows)
54-
if: matrix.platform == 'windows-latest'
55-
uses: humbletim/setup-vulkan-sdk@v1.2.1
56-
with:
57-
vulkan-query-version: latest
58-
vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
59-
vulkan-use-cache: false
60-
61-
- name: Download glslc manually (Windows)
53+
- name: Install Vulkan SDK (Windows)
6254
if: matrix.platform == 'windows-latest'
6355
run: |
64-
# Since the action might not install glslc properly, let's get it from vcpkg
65-
vcpkg install glslang:x64-windows
56+
Write-Host "Installing Vulkan components via vcpkg..."
57+
58+
# Install all Vulkan components via vcpkg
59+
vcpkg install vulkan:x64-windows vulkan-headers:x64-windows vulkan-loader:x64-windows glslang:x64-windows spirv-tools:x64-windows
60+
61+
# Set up environment for CMake to find everything
62+
$vcpkgRoot = "C:\vcpkg\installed\x64-windows"
6663
67-
# Find and copy glslc to where CMake expects it
68-
$glslcPath = Get-ChildItem -Path "C:\vcpkg\installed\x64-windows\tools" -Filter "glslc.exe" -Recurse | Select-Object -First 1
69-
if ($glslcPath) {
70-
Write-Host "Found glslc at: $($glslcPath.FullName)"
71-
Copy-Item $glslcPath.FullName "$env:VULKAN_SDK\Bin\" -Force
72-
}
64+
echo "VULKAN_SDK=$vcpkgRoot" >> $env:GITHUB_ENV
65+
echo "CMAKE_PREFIX_PATH=$vcpkgRoot" >> $env:GITHUB_ENV
66+
echo "CMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake" >> $env:GITHUB_ENV
67+
echo "$vcpkgRoot\bin" >> $env:GITHUB_PATH
68+
echo "$vcpkgRoot\tools\glslang" >> $env:GITHUB_PATH
7369
74-
# Add vcpkg tools to PATH as backup
75-
echo "C:\vcpkg\installed\x64-windows\tools\glslang" >> $env:GITHUB_PATH
70+
# Verify installations
71+
Write-Host "Checking for required files..."
72+
dir "$vcpkgRoot\bin\*vulkan*"
73+
dir "$vcpkgRoot\tools\glslang\glslc.exe"
7674
7775
- name: install frontend dependencies
7876
run: npm install

0 commit comments

Comments
 (0)