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

Commit d1150d0

Browse files
authored
Merge pull request #78 from JSKitty/master
More Vulkan attempts
2 parents 1a4e562 + da76baa commit d1150d0

1 file changed

Lines changed: 25 additions & 6 deletions

File tree

.github/workflows/publish.yaml

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,38 @@ jobs:
5858
# Install all Vulkan components via vcpkg
5959
vcpkg install vulkan:x64-windows vulkan-headers:x64-windows vulkan-loader:x64-windows glslang:x64-windows spirv-tools:x64-windows
6060
61-
# Set up environment for CMake to find everything
61+
# Set up environment for CMake
6262
$vcpkgRoot = "C:\vcpkg\installed\x64-windows"
6363
6464
echo "VULKAN_SDK=$vcpkgRoot" >> $env:GITHUB_ENV
6565
echo "CMAKE_PREFIX_PATH=$vcpkgRoot" >> $env:GITHUB_ENV
6666
echo "CMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake" >> $env:GITHUB_ENV
6767
echo "$vcpkgRoot\bin" >> $env:GITHUB_PATH
68-
echo "$vcpkgRoot\tools\glslang" >> $env:GITHUB_PATH
6968
70-
# Verify installations
71-
Write-Host "Checking for required files..."
72-
dir "$vcpkgRoot\bin\*vulkan*"
73-
dir "$vcpkgRoot\tools\glslang\glslc.exe"
69+
# Find glslc.exe - it might be in a different location
70+
Write-Host "Searching for glslc.exe..."
71+
$glslc = Get-ChildItem -Path "C:\vcpkg" -Filter "glslc.exe" -Recurse -ErrorAction SilentlyContinue | Select-Object -First 1
72+
if ($glslc) {
73+
Write-Host "Found glslc at: $($glslc.FullName)"
74+
$glslcDir = Split-Path $glslc.FullName -Parent
75+
echo "$glslcDir" >> $env:GITHUB_PATH
76+
77+
# Also copy to where CMake might expect it
78+
New-Item -ItemType Directory -Force -Path "$vcpkgRoot\bin"
79+
Copy-Item $glslc.FullName "$vcpkgRoot\bin\" -Force
80+
} else {
81+
Write-Host "glslc.exe not found - glslang might provide glslangValidator instead"
82+
# Look for glslangValidator as alternative
83+
$glslangValidator = Get-ChildItem -Path "C:\vcpkg" -Filter "glslangValidator.exe" -Recurse -ErrorAction SilentlyContinue
84+
if ($glslangValidator) {
85+
Write-Host "Found glslangValidator at: $($glslangValidator.FullName)"
86+
}
87+
}
88+
89+
# List what we have
90+
Write-Host "Checking installations..."
91+
dir "$vcpkgRoot\bin"
92+
dir "$vcpkgRoot\tools" -ErrorAction SilentlyContinue
7493
7594
- name: install frontend dependencies
7695
run: npm install

0 commit comments

Comments
 (0)