From 4398585bdcc9df04cdcc010972e3f8e31d642f26 Mon Sep 17 00:00:00 2001 From: Iceflower Date: Fri, 19 Jul 2024 23:17:06 +0200 Subject: [PATCH] [ci] Fix Vulkan SDK installation --- .github/workflows/build.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 614a3fa0d..baf5a3ecd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,6 +8,8 @@ on: env: INEXOR_VULKAN_VERSION: "1.3.283.0" INEXOR_VULKAN_SDK_PATH: "$GITHUB_WORKSPACE/../vulkan_sdk/" + INEXOR_VULKAN_SDK_CHECKSUM_LINUX: "8005e2cf3e89c80cbe1c0d0a259c88248de3257b4fc6fdefb47409edb3e43ecb" + INEXOR_VULKAN_SDK_CHECKSUM_WINDOWS: "811fcb9b43d09248520b2f38ae9a3763fc81df950fdab874f23bd762b07a9b12" jobs: linux: @@ -89,18 +91,13 @@ jobs: - name: Install Vulkan SDK shell: bash run: | - # Download Vulkan SDK - ls - curl -LS -o vulkansdk.tar.xz \ - https://sdk.lunarg.com/sdk/download/${{ env.INEXOR_VULKAN_VERSION }}/linux/vulkansdk-linux-x86_64-${{ env.INEXOR_VULKAN_VERSION }}.tar.xz - ls - # Create Vulkan SDK directory and extract - mkdir "${{ env.INEXOR_VULKAN_SDK_PATH }}" - ls + curl -LS -o vulkansdk.tar.xz https://sdk.lunarg.com/sdk/download/${{ env.INEXOR_VULKAN_VERSION }}/linux/vulkansdk-linux-x86_64-${{ env.INEXOR_VULKAN_VERSION }}.tar.xz + echo "${{ env.INEXOR_VULKAN_SDK_CHECKSUM_LINUX }} vulkansdk.tar.xz" | sha256sum --check + mkdir -p ${{ env.INEXOR_VULKAN_SDK_PATH }} tar xf vulkansdk.tar.xz -C "${{ env.INEXOR_VULKAN_SDK_PATH }}" - ls - cd .. - ls + rm -rf vulkansdk.tar.xz + # runtime depenedencies + apt-get -y install qtbase5-dev libxcb-xinput0 libxcb-xinerama0 - name: Checkout uses: actions/checkout@v3 @@ -112,6 +109,8 @@ jobs: export CXX=${{ matrix.config.cxx }} export VULKAN_SDK="${{ env.INEXOR_VULKAN_SDK_PATH }}/${{ env.INEXOR_VULKAN_VERSION }}/x86_64" export PATH=$VULKAN_SDK/bin:$PATH + export LD_LIBRARY_PATH=$VULKAN_SDK/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} + export VK_LAYER_PATH=$VULKAN_SDK/share/vulkan/explicit_layer.d cmake . \ -Bbuild \ -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \ @@ -218,8 +217,7 @@ jobs: - name: Install Vulkan SDK shell: pwsh run: | - curl -LS -o vulkansdk.exe ` - https://sdk.lunarg.com/sdk/download/${{ env.INEXOR_VULKAN_VERSION }}/windows/VulkanSDK-${{ env.INEXOR_VULKAN_VERSION }}-Installer.exe + curl -LS -o vulkansdk.exe https://sdk.lunarg.com/sdk/download/${{ env.INEXOR_VULKAN_VERSION }}/windows/VulkanSDK-${{ env.INEXOR_VULKAN_VERSION }}-Installer.exe 7z x vulkansdk.exe -o"${{ env.INEXOR_VULKAN_SDK_PATH }}" - name: Configure CMake