Skip to content

Commit 0372d31

Browse files
authored
ci: Update vulkan sdk to 1.4.321.0 (#8157)
1 parent 9a8dbfb commit 0372d31

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ env:
1919
#
2020

2121
# Sourced from https://vulkan.lunarg.com/sdk/home#linux
22-
VULKAN_SDK_VERSION: "1.4.313"
23-
VULKAN_FULL_SDK_VERSION: "1.4.313.0"
22+
VULKAN_SDK_VERSION: "1.4.321"
23+
VULKAN_FULL_SDK_VERSION: "1.4.321.0"
2424

2525
# These Mesa version definition is duplicated in the install-mesa action.
2626
MESA_VERSION: "24.3.4"
@@ -608,14 +608,16 @@ jobs:
608608
run: |
609609
set -e
610610
611-
sudo apt-get update -y -qq
611+
curl -L --retry 5 https://sdk.lunarg.com/sdk/download/${{ env.VULKAN_FULL_SDK_VERSION }}/linux/vulkansdk-linux-x86_64-${{ env.VULKAN_FULL_SDK_VERSION }}.tar.xz -o vulkan-sdk.tar.xz
612+
mkdir vulkan-sdk
613+
tar xpf vulkan-sdk.tar.xz -C vulkan-sdk
614+
615+
mv ./vulkan-sdk/${{ env.VULKAN_FULL_SDK_VERSION }} $HOME/VulkanSDK
612616
613-
# vulkan sdk
614-
wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
615-
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-${{ env.VULKAN_SDK_VERSION }}-noble.list https://packages.lunarg.com/vulkan/${{ env.VULKAN_SDK_VERSION }}/lunarg-vulkan-$VULKAN_SDK_VERSION-noble.list
617+
echo "$HOME/VulkanSDK/x86_64/bin" >> "$GITHUB_PATH"
618+
echo "LD_LIBRARY_PATH=$HOME/VulkanSDK/x86_64/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> "$GITHUB_ENV"
619+
echo "VK_ADD_LAYER_PATH=$HOME/VulkanSDK/x86_64/share/vulkan/explicit_layer.d" >> "$GITHUB_ENV"
616620
617-
sudo apt-get update
618-
sudo apt install -y vulkan-sdk
619621
620622
- name: (Linux) Install Mesa
621623
if: matrix.os == 'ubuntu-24.04'

.github/workflows/shaders.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ on:
1515

1616
env:
1717
# Sourced from https://vulkan.lunarg.com/sdk/home#linux
18-
#
19-
# We don't include the 4th version number, as it's not used in any URL.
20-
VULKAN_SDK_VERSION: "1.4.313"
18+
VULKAN_SDK_VERSION: "1.4.321"
19+
VULKAN_FULL_SDK_VERSION: "1.4.321.0"
2120

2221
# Every time a PR is pushed to, cancel any previous jobs. This
2322
# makes us behave nicer to github and get faster turnaround times
@@ -104,14 +103,15 @@ jobs:
104103
run: |
105104
set -e
106105
107-
sudo apt-get update -y -qq
106+
curl -L --retry 5 https://sdk.lunarg.com/sdk/download/${{ env.VULKAN_FULL_SDK_VERSION }}/linux/vulkansdk-linux-x86_64-${{ env.VULKAN_FULL_SDK_VERSION }}.tar.xz -o vulkan-sdk.tar.xz
107+
mkdir vulkan-sdk
108+
tar xpf vulkan-sdk.tar.xz -C vulkan-sdk
108109
109-
# vulkan sdk
110-
wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
111-
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-$VULKAN_SDK_VERSION-noble.list https://packages.lunarg.com/vulkan/$VULKAN_SDK_VERSION/lunarg-vulkan-$VULKAN_SDK_VERSION-noble.list
110+
mv ./vulkan-sdk/${{ env.VULKAN_FULL_SDK_VERSION }} $HOME/VulkanSDK
112111
113-
sudo apt-get update
114-
sudo apt install -y vulkan-sdk
112+
echo "$HOME/VulkanSDK/x86_64/bin" >> "$GITHUB_PATH"
113+
echo "LD_LIBRARY_PATH=$HOME/VulkanSDK/x86_64/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> "$GITHUB_ENV"
114+
echo "VK_ADD_LAYER_PATH=$HOME/VulkanSDK/x86_64/share/vulkan/explicit_layer.d" >> "$GITHUB_ENV"
115115
116116
- name: Install Graphviz
117117
run: sudo apt-get install graphviz

0 commit comments

Comments
 (0)