Skip to content

Commit 85e3cb2

Browse files
committed
update(workflow): enhance ARM64 Vulkan installation
1 parent a7855e5 commit 85e3cb2

1 file changed

Lines changed: 26 additions & 10 deletions

File tree

.github/workflows/main.yml

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -166,16 +166,32 @@ jobs:
166166
if: contains(matrix.name, 'vulkan') && matrix.arch == 'arm64'
167167
run: |
168168
sudo apt-get update -y
169-
sudo apt-get install -y mesa-vulkan-drivers vulkan-tools
170-
# Install Vulkan SDK for ARM64
171-
wget https://sdk.lunarg.com/sdk/download/latest/linux/vulkan-sdk.tar.xz?u= -O vulkan-sdk.tar.xz
172-
tar -xf vulkan-sdk.tar.xz
173-
cd $(ls -d 1.* | head -n1)
174-
source setup-env.sh
175-
echo "VULKAN_SDK=$VULKAN_SDK" >> $GITHUB_ENV
176-
echo "PATH=$PATH" >> $GITHUB_ENV
177-
echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV
178-
echo "VK_ADD_LAYER_PATH=$VK_ADD_LAYER_PATH" >> $GITHUB_ENV
169+
sudo apt-get install -y mesa-vulkan-drivers vulkan-tools libvulkan-dev vulkan-validationlayers-dev spirv-tools
170+
# Try to install glslc from system packages first
171+
sudo apt-get install -y glslc || true
172+
# If glslc is not available, install from Vulkan SDK
173+
if ! which glslc; then
174+
# Install Vulkan SDK for ARM64
175+
wget -q https://sdk.lunarg.com/sdk/download/latest/linux/vulkan-sdk.tar.xz -O vulkan-sdk.tar.xz
176+
tar -xf vulkan-sdk.tar.xz
177+
SDK_DIR=$(ls -d 1.* | head -n1)
178+
if [ -d "$SDK_DIR" ]; then
179+
cd "$SDK_DIR"
180+
source setup-env.sh
181+
echo "VULKAN_SDK=$VULKAN_SDK" >> $GITHUB_ENV
182+
echo "PATH=$PATH" >> $GITHUB_ENV
183+
echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV
184+
echo "VK_ADD_LAYER_PATH=$VK_ADD_LAYER_PATH" >> $GITHUB_ENV
185+
else
186+
# Fallback: set basic Vulkan environment
187+
echo "VULKAN_SDK=/usr" >> $GITHUB_ENV
188+
echo "VK_LAYER_PATH=/usr/share/vulkan/explicit_layer.d" >> $GITHUB_ENV
189+
fi
190+
else
191+
# Use system installation
192+
echo "VULKAN_SDK=/usr" >> $GITHUB_ENV
193+
echo "VK_LAYER_PATH=/usr/share/vulkan/explicit_layer.d" >> $GITHUB_ENV
194+
fi
179195
180196
- name: windows build sqlite-ai
181197
if: matrix.name == 'windows'

0 commit comments

Comments
 (0)