From 3ff81dd999ff28eae208b5e46d55d33eaf73abd2 Mon Sep 17 00:00:00 2001 From: Eduard-Mihai Burtescu Date: Thu, 18 Sep 2025 15:55:38 +0300 Subject: [PATCH 1/2] ci: remove `NcStudios/VulkanCI@v1.2` (used for SwiftShader on Windows). --- .github/workflows/ci.yaml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 571a800608..651953dbe7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -29,11 +29,6 @@ jobs: with: version: 1.4.309.0 cache: true - - if: ${{ runner.os == 'Windows' }} - name: Install Vulkan Runtime with SwiftShader (Windows) - uses: NcStudios/VulkanCI@v1.2 - with: - sdkVersion: 1.4.309.0 - if: ${{ runner.os == 'Linux' }} name: Linux - Install native dependencies run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev @@ -93,11 +88,6 @@ jobs: with: version: 1.4.309.0 cache: true - - if: ${{ runner.os == 'Windows' }} - name: Install Vulkan Runtime with SwiftShader (Windows) - uses: NcStudios/VulkanCI@v1.2 - with: - sdkVersion: 1.4.309.0 - name: install rust-toolchain run: cargo version - name: cargo fetch --locked @@ -139,11 +129,6 @@ jobs: with: version: 1.4.309.0 cache: true - - if: ${{ runner.os == 'Windows' }} - name: Install Vulkan Runtime with SwiftShader (Windows) - uses: NcStudios/VulkanCI@v1.2 - with: - sdkVersion: 1.4.309.0 - name: install rust-toolchain run: echo "TARGET=$(rustc --print host-tuple)" >> "$GITHUB_ENV" - name: cargo fetch --locked @@ -164,11 +149,6 @@ jobs: with: version: 1.4.309.0 cache: true - - if: ${{ runner.os == 'Windows' }} - name: Install Vulkan Runtime with SwiftShader (Windows) - uses: NcStudios/VulkanCI@v1.2 - with: - sdkVersion: 1.4.309.0 - if: ${{ runner.os == 'Linux' }} name: Linux - Install native dependencies run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev From c60381efe1ba70bae4c92d5d3ca47142768068c5 Mon Sep 17 00:00:00 2001 From: Eduard-Mihai Burtescu Date: Thu, 18 Sep 2025 17:58:04 +0300 Subject: [PATCH 2/2] ci: switch to `jakoch/install-vulkan-sdk-action@v1` for Vulkan SDK + SwiftShader. --- .github/workflows/ci.yaml | 56 ++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 651953dbe7..e66f0c5e30 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -25,10 +25,16 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install Vulkan SDK - uses: humbletim/install-vulkan-sdk@v1.2 + uses: jakoch/install-vulkan-sdk-action@v1 with: - version: 1.4.309.0 + vulkan_version: 1.4.309.0 + 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 @@ -84,10 +90,16 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install Vulkan SDK - uses: humbletim/install-vulkan-sdk@v1.2 + uses: jakoch/install-vulkan-sdk-action@v1 with: - version: 1.4.309.0 + vulkan_version: 1.4.309.0 + 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 @@ -125,10 +137,16 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install Vulkan SDK - uses: humbletim/install-vulkan-sdk@v1.2 + uses: jakoch/install-vulkan-sdk-action@v1 with: - version: 1.4.309.0 + vulkan_version: 1.4.309.0 + 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 @@ -145,10 +163,22 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install Vulkan SDK - uses: humbletim/install-vulkan-sdk@v1.2 + uses: jakoch/install-vulkan-sdk-action@v1 with: - version: 1.4.309.0 + vulkan_version: 1.4.309.0 + 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 == 'Windows' }} + name: Windows - Use SwiftShader 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" - if: ${{ runner.os == 'Linux' }} name: Linux - Install native dependencies run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev @@ -199,10 +229,16 @@ jobs: - name: Install native dependencies run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev - name: Install Vulkan SDK - uses: humbletim/install-vulkan-sdk@v1.2 + uses: jakoch/install-vulkan-sdk-action@v1 with: - version: 1.4.309.0 + vulkan_version: 1.4.309.0 + 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 rustup components run: rustup component add rustfmt clippy # cargo version is a random command that forces the installation of rust-toolchain