From 8a838d81d6aa86fbbc28b97a4ddde90f003eaa69 Mon Sep 17 00:00:00 2001 From: firestar99 Date: Tue, 16 Dec 2025 11:59:12 +0100 Subject: [PATCH 1/8] ci: don't install swiftshader where not necessary also allow `workflow_dispatch` so we can launch CI pipelines manually on random branches without opening a PR --- .github/workflows/ci.yaml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4116830834..af7e4221ed 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -4,6 +4,7 @@ on: - main pull_request: merge_group: + workflow_dispatch: name: CI @@ -32,10 +33,6 @@ jobs: install_runtime: true cache: true stripdown: true - - # FIXME(eddyb) consider using lavapipe instead, or even trying both. - install_swiftshader: true - # install_lavapipe: true - if: ${{ runner.os == 'Linux' }} name: Linux - Install native dependencies run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev @@ -97,10 +94,6 @@ jobs: install_runtime: true cache: true stripdown: true - - # FIXME(eddyb) consider using lavapipe instead, or even trying both. - install_swiftshader: true - # install_lavapipe: true - name: install rust-toolchain run: cargo version - name: cargo fetch --locked @@ -145,10 +138,6 @@ jobs: install_runtime: true cache: true stripdown: true - - # FIXME(eddyb) consider using lavapipe instead, or even trying both. - install_swiftshader: true - # install_lavapipe: true - name: install rust-toolchain run: echo "TARGET=$(rustc --print host-tuple)" >> "$GITHUB_ENV" - name: cargo fetch --locked @@ -240,10 +229,6 @@ jobs: install_runtime: true cache: true stripdown: true - - # FIXME(eddyb) consider using lavapipe instead, or even trying both. - install_swiftshader: true - # install_lavapipe: true # cargo version is a random command that forces the installation of rust-toolchain - name: install rust-toolchain run: cargo version From 9394ea4beba98a59b4969590c8362f988075d728 Mon Sep 17 00:00:00 2001 From: firestar99 Date: Tue, 16 Dec 2025 12:00:48 +0100 Subject: [PATCH 2/8] ci: switch from swiftsharer to lavapipe --- .github/workflows/ci.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index af7e4221ed..6432e34281 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -163,14 +163,14 @@ jobs: stripdown: true # FIXME(eddyb) consider using lavapipe instead, or even trying both. - install_swiftshader: true - # install_lavapipe: true + # install_swiftshader: true + install_lavapipe: true - if: ${{ runner.os == 'Windows' }} - name: Windows - Use SwiftShader as Vulkan driver + name: Windows - Use Lavapipe as Vulkan driver # FIXME(eddyb) ideally `jakoch/install-vulkan-sdk-action` should do this. run: | - echo "C:/Swiftshader/" >> "$GITHUB_PATH" - echo "VK_DRIVER_FILES=C:/Swiftshader/vk_swiftshader_icd.json" >> "$GITHUB_ENV" + echo "C:/Lavapipe/" >> "$GITHUB_PATH" + echo "VK_DRIVER_FILES=C:/Lavapipe/share/vulkan/icd.d/lvp_icd.x86_64.json" >> "$GITHUB_ENV" - if: ${{ runner.os == 'Linux' }} name: Linux - Install native dependencies run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev From 5a4bea9c694cec11dd7ed1b1f80c40d4950bfb59 Mon Sep 17 00:00:00 2001 From: firestar99 Date: Tue, 16 Dec 2025 13:12:02 +0100 Subject: [PATCH 3/8] ci: env VK_LOADER_DEBUG=error,warn,info --- .github/workflows/ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6432e34281..a36e3cf371 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -191,6 +191,8 @@ jobs: run: cargo test -p "difftest*" --release --no-default-features --features "use-installed-tools" - name: difftests run: cargo run -p difftests --release --no-default-features --features "use-installed-tools" + env: + VK_LOADER_DEBUG: error,warn,info # This allows us to have a single job we can branch protect on, rather than needing # to update the branch protection rules when the test matrix changes From f7e612327af495b453bd93804a45dd5fcf11b068 Mon Sep 17 00:00:00 2001 From: firestar99 Date: Tue, 16 Dec 2025 14:08:14 +0100 Subject: [PATCH 4/8] bla --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a36e3cf371..ef9c9eb808 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -171,6 +171,9 @@ jobs: run: | echo "C:/Lavapipe/" >> "$GITHUB_PATH" echo "VK_DRIVER_FILES=C:/Lavapipe/share/vulkan/icd.d/lvp_icd.x86_64.json" >> "$GITHUB_ENV" + - run: cat C:/Lavapipe/share/vulkan/icd.d/lvp_icd.x86_64.json + - run: ll C:/Lavapipe/share/vulkan/icd.d/ + - run: ll C:/Lavapipe/ - if: ${{ runner.os == 'Linux' }} name: Linux - Install native dependencies run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev From 263f0b7344b5be1f203aa8ec66a6f965e35fa148 Mon Sep 17 00:00:00 2001 From: firestar99 Date: Tue, 16 Dec 2025 14:09:56 +0100 Subject: [PATCH 5/8] bla2 --- .github/workflows/ci.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ef9c9eb808..6b1327014e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -172,8 +172,9 @@ jobs: echo "C:/Lavapipe/" >> "$GITHUB_PATH" echo "VK_DRIVER_FILES=C:/Lavapipe/share/vulkan/icd.d/lvp_icd.x86_64.json" >> "$GITHUB_ENV" - run: cat C:/Lavapipe/share/vulkan/icd.d/lvp_icd.x86_64.json - - run: ll C:/Lavapipe/share/vulkan/icd.d/ - - run: ll C:/Lavapipe/ + - run: ls -la C:/Lavapipe/share/vulkan/icd.d/ + - run: ls -la C:/Lavapipe/ + - run: ls -la C:/Lavapipe/bin/ - if: ${{ runner.os == 'Linux' }} name: Linux - Install native dependencies run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev From 80ef47e97417a9b89504417e57e3960030d7ac85 Mon Sep 17 00:00:00 2001 From: firestar99 Date: Tue, 16 Dec 2025 15:13:41 +0100 Subject: [PATCH 6/8] bla3 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6b1327014e..5b4f2977a4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -169,7 +169,7 @@ jobs: name: Windows - Use Lavapipe as Vulkan driver # FIXME(eddyb) ideally `jakoch/install-vulkan-sdk-action` should do this. run: | - echo "C:/Lavapipe/" >> "$GITHUB_PATH" + echo "C:/Lavapipe/bin/" >> "$GITHUB_PATH" echo "VK_DRIVER_FILES=C:/Lavapipe/share/vulkan/icd.d/lvp_icd.x86_64.json" >> "$GITHUB_ENV" - run: cat C:/Lavapipe/share/vulkan/icd.d/lvp_icd.x86_64.json - run: ls -la C:/Lavapipe/share/vulkan/icd.d/ From 6379d6c9237b1b87977b767be529ed9eb3fbdbca Mon Sep 17 00:00:00 2001 From: firestar99 Date: Tue, 16 Dec 2025 16:08:56 +0100 Subject: [PATCH 7/8] bla4 --- .github/workflows/ci.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5b4f2977a4..e1a226b2ca 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -171,10 +171,15 @@ jobs: run: | echo "C:/Lavapipe/bin/" >> "$GITHUB_PATH" echo "VK_DRIVER_FILES=C:/Lavapipe/share/vulkan/icd.d/lvp_icd.x86_64.json" >> "$GITHUB_ENV" - - run: cat C:/Lavapipe/share/vulkan/icd.d/lvp_icd.x86_64.json - - run: ls -la C:/Lavapipe/share/vulkan/icd.d/ - - run: ls -la C:/Lavapipe/ - - run: ls -la C:/Lavapipe/bin/ + - if: ${{ runner.os == 'Windows' }} + run: cat C:/Lavapipe/share/vulkan/icd.d/lvp_icd.x86_64.json + - if: ${{ runner.os == 'Windows' }} + run: ls -la C:/Lavapipe/share/vulkan/icd.d/ + - if: ${{ runner.os == 'Windows' }} + run: ls -la C:/Lavapipe/ + - if: ${{ runner.os == 'Windows' }} + run: ls -la C:/Lavapipe/bin/ + - run: VK_LOADER_DEBUG=error,warn,info vkcube - if: ${{ runner.os == 'Linux' }} name: Linux - Install native dependencies run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev From d19ad6ee0a57458ba09e9675a43e4f7131cfee67 Mon Sep 17 00:00:00 2001 From: firestar99 Date: Tue, 16 Dec 2025 17:30:34 +0100 Subject: [PATCH 8/8] bla5 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e1a226b2ca..0c50e2ced4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -179,7 +179,7 @@ jobs: run: ls -la C:/Lavapipe/ - if: ${{ runner.os == 'Windows' }} run: ls -la C:/Lavapipe/bin/ - - run: VK_LOADER_DEBUG=error,warn,info vkcube + - run: VK_LOADER_DEBUG=error,warn,info vulkaninfo - if: ${{ runner.os == 'Linux' }} name: Linux - Install native dependencies run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev