From 01cd5f05ce7ffbbee098363761f914d2ab6517d9 Mon Sep 17 00:00:00 2001 From: Patrick Owen Date: Fri, 21 Aug 2026 22:03:14 -0400 Subject: [PATCH 1/2] Use install-vulkan-sdk-action GitHub action, including lavapipe software rasterizer --- .github/workflows/rust.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 63b69408..4369b87d 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -18,20 +18,12 @@ jobs: runs-on: ${{ matrix.os }} steps: - - name: Set Windows environment variables - if: matrix.os == 'windows-latest' - shell: bash - run: | - echo "VULKAN_VERSION=1.3.290.0" >> "$GITHUB_ENV" - echo "VULKAN_SDK=C:/VulkanSDK/1.3.290.0" >> "$GITHUB_ENV" - - name: Install dependencies - if: matrix.os == 'ubuntu-latest' - run: sudo apt update && sudo apt-get -y install libasound2-dev libvulkan-dev libfontconfig-dev libshaderc-dev - name: Install Vulkan SDK - if: matrix.os == 'windows-latest' - run: | - Invoke-WebRequest -Uri "https://sdk.lunarg.com/sdk/download/${{ env.VULKAN_VERSION }}/windows/VulkanSDK-${{ env.VULKAN_VERSION }}-Installer.exe" -OutFile vulkan.exe - ./vulkan.exe --accept-licenses --default-answer --confirm-command install + uses: jakoch/install-vulkan-sdk-action@v1 + with: + vulkan_version: 1.3.290.0 + install_runtime: true + install_lavapipe: true - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - run: cargo build --workspace --all-targets --locked From 5b5c48b60a4cec1588701ed5600c6f33f917b882 Mon Sep 17 00:00:00 2001 From: Patrick Owen Date: Fri, 21 Aug 2026 22:05:13 -0400 Subject: [PATCH 2/2] Stop ignoring Vulkan tests, now that CI can run Vulkan code --- client/src/graphics/tests.rs | 1 - client/src/graphics/voxels/tests.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/client/src/graphics/tests.rs b/client/src/graphics/tests.rs index 48156f28..5b16723d 100644 --- a/client/src/graphics/tests.rs +++ b/client/src/graphics/tests.rs @@ -1,7 +1,6 @@ use super::Base; #[test] -#[ignore] fn init_base() { let _guard = common::tracing_guard(); Base::headless(); diff --git a/client/src/graphics/voxels/tests.rs b/client/src/graphics/voxels/tests.rs index a167e3b4..851add29 100644 --- a/client/src/graphics/voxels/tests.rs +++ b/client/src/graphics/voxels/tests.rs @@ -147,7 +147,6 @@ struct Surface { } #[test] -#[ignore] fn surface_extraction() { assert_eq!(mem::size_of::(), 8);