Skip to content

Commit 1b3afa6

Browse files
committed
fix: update Vulkan SDK on the Ubuntu build in the CI
1 parent fabcc17 commit 1b3afa6

2 files changed

Lines changed: 28 additions & 18 deletions

File tree

.github/workflows/build.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,18 +168,26 @@ jobs:
168168
env:
169169
VULKAN_VERSION: 1.4.313.2
170170
run: |
171+
# $env:VULKAN_VERSION = & curl.exe -fsSL https://vulkan.lunarg.com/sdk/latest/linux.txt
172+
# Write-Host "Downloading Vulkan SDK version $env:VULKAN_VERSION"
173+
171174
curl.exe -o $env:RUNNER_TEMP/VulkanSDK-Installer.exe -L "https://sdk.lunarg.com/sdk/download/${env:VULKAN_VERSION}/windows/vulkansdk-windows-X64-${env:VULKAN_VERSION}.exe"
172175
& "$env:RUNNER_TEMP\VulkanSDK-Installer.exe" --accept-licenses --default-answer --confirm-command install
173176
Add-Content $env:GITHUB_ENV "VULKAN_SDK=C:\VulkanSDK\${env:VULKAN_VERSION}"
174177
Add-Content $env:GITHUB_PATH "C:\VulkanSDK\${env:VULKAN_VERSION}\bin"
175178
176179
- name: Install Vulkan SDK on Ubuntu
177180
if: matrix.config.name == 'Ubuntu (1)'
181+
env:
182+
VULKAN_VERSION: 1.4.313.2
178183
run: |
179-
wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo tee /etc/apt/trusted.gpg.d/lunarg.asc
180-
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-jammy.list https://packages.lunarg.com/vulkan/lunarg-vulkan-jammy.list
181-
sudo apt update
182-
sudo apt install vulkan-sdk
184+
# export VULKAN_VERSION="$(curl -fsSL https://vulkan.lunarg.com/sdk/latest/linux.txt)"
185+
# echo "Downloading Vulkan SDK version ${VULKAN_VERSION}"
186+
187+
mkdir -p "/opt/vulkan-sdk"
188+
curl --no-progress-meter "https://sdk.lunarg.com/sdk/download/${VULKAN_VERSION}/linux/vulkan_sdk.tar.xz" | tar -Jx --strip-components=1 -C "/opt/vulkan-sdk"
189+
echo "VULKAN_SDK=/opt/vulkan-sdk/x86_64" >> $GITHUB_ENV
190+
echo "/opt/vulkan-sdk/x86_64/bin" >> $GITHUB_PATH
183191
184192
- name: Install dependencies on macOS
185193
if: matrix.config.name == 'macOS x64' || matrix.config.name == 'macOS arm64'

docs/guide/Vulkan.md

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,23 +41,25 @@ If you see `Vulkan used VRAM` in the output, it means that Vulkan support is wor
4141
#### Windows: [Vulkan SDK installer](https://sdk.lunarg.com/sdk/download/latest/windows/vulkan-sdk.exe) {#vulkan-sdk-windows}
4242
>
4343
#### Ubuntu {#vulkan-sdk-ubuntu}
44-
::: code-group
45-
46-
```shell [Ubuntu 24.04]
47-
wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo tee /etc/apt/trusted.gpg.d/lunarg.asc
48-
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-noble.list https://packages.lunarg.com/vulkan/lunarg-vulkan-noble.list
44+
```shell
4945
sudo apt update
50-
sudo apt install vulkan-sdk
51-
```
46+
sudo apt install curl wget xz-utils
5247

53-
```shell [Ubuntu 22.04]
54-
wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo tee /etc/apt/trusted.gpg.d/lunarg.asc
55-
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-jammy.list https://packages.lunarg.com/vulkan/lunarg-vulkan-jammy.list
56-
sudo apt update
57-
sudo apt install vulkan-sdk
58-
```
48+
export VULKAN_VERSION="$(curl -fsSL https://vulkan.lunarg.com/sdk/latest/linux.txt)"
5949

60-
:::
50+
echo "Downloading Vulkan SDK version ${VULKAN_VERSION}"
51+
curl --progress-bar "https://sdk.lunarg.com/sdk/download/${VULKAN_VERSION}/linux/vulkan_sdk.tar.xz" -o "/opt/vulkan-sdk.tar.xz"
52+
53+
echo "Installing Vulkan SDK to /opt/vulkan-sdk"
54+
rm -rf "/opt/vulkan-sdk" && mkdir -p "/opt/vulkan-sdk"
55+
tar -Jxf "/opt/vulkan-sdk.tar.xz" --strip-components=1 -C "/opt/vulkan-sdk"
56+
rm -f "/opt/vulkan-sdk.tar.xz"
57+
58+
echo "Adding Vulkan SDK environment variables to shell profiles"
59+
([ ! -f "$HOME/.bashrc" ] || grep -qxF "source /opt/vulkan-sdk/setup-env.sh" "$HOME/.bashrc") || (echo "source /opt/vulkan-sdk/setup-env.sh" >> "$HOME/.bashrc")
60+
([ ! -f "$HOME/.zshrc" ] || grep -qxF "source /opt/vulkan-sdk/setup-env.sh" "$HOME/.zshrc") || (echo "source /opt/vulkan-sdk/setup-env.sh" >> "$HOME/.zshrc")
61+
source /opt/vulkan-sdk/setup-env.sh
62+
```
6163

6264
* :::details Windows only: enable long paths support
6365
Open cmd as Administrator and run this command:

0 commit comments

Comments
 (0)