File tree Expand file tree Collapse file tree 3 files changed +14
-17
lines changed
Expand file tree Collapse file tree 3 files changed +14
-17
lines changed Original file line number Diff line number Diff line change 6464 - name : Install Vulkan drivers
6565 run : sudo apt install -y mesa-vulkan-drivers
6666
67- # - name: Install Vulkan
68- # run: sudo apt install -y libvulkan-dev glslang-dev libshaderc-dev spirv-tools
69-
7067 # Install Vulkan SDK
7168 - name : Install Vulkan
7269 env :
Original file line number Diff line number Diff line change @@ -63,20 +63,17 @@ jobs:
6363
6464 - name : Install Vulkan drivers
6565 run : sudo apt install -y mesa-vulkan-drivers
66-
67- - name : Install Vulkan
68- run : sudo apt install -y libvulkan-dev glslang-dev libshaderc-dev spirv-tools
69-
70- # # Install Vulkan SDK
71- # - name: Install/Build Vulkan SDK
72- # env:
73- # BUILD_VULKAN: ON # needed
74- # run: |
75- # ./etc/linux/install_vulkan.sh
66+
67+ # Install Vulkan SDK
68+ - name : Install/Build Vulkan SDK
69+ env :
70+ BUILD_VULKAN : ON # needed
71+ run : |
72+ ./etc/linux/install_vulkan.sh
7673
77- # echo "VULKAN_SDK=$VULKAN_SDK" >> $GITHUB_ENV
78- # echo "${VULKAN_SDK}/bin" >> $GITHUB_PATH
79- # echo "VK_LAYER_PATH=$VULKAN_SDK/lib" >> $GITHUB_ENV
74+ echo "VULKAN_SDK=$VULKAN_SDK" >> $GITHUB_ENV
75+ echo "${VULKAN_SDK}/bin" >> $GITHUB_PATH
76+ echo "VK_LAYER_PATH=$VULKAN_SDK/lib" >> $GITHUB_ENV
8077
8178 - name : Synchronize clock
8279 run : |
Original file line number Diff line number Diff line change @@ -207,7 +207,10 @@ elseif(UNIX)
207207 #
208208 # Linux generators
209209 #
210- set (CPACK_GENERATOR DEB RPM TGZ)
210+ set (CPACK_GENERATOR $ENV{CPACK_GENERATOR} )
211+ if (NOT CPACK_GENERATOR)
212+ set (CPACK_GENERATOR DEB RPM TGZ)
213+ endif ()
211214
212215 #
213216 # Linux icon and .desktop shortcut
You can’t perform that action at this time.
0 commit comments