Update CI Dependencies (#6306)

gfx-rs · Sep 22, 2024 · 39cfeef · 39cfeef
1 parent 2f81ae1
commit 39cfeef
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,21 +13,23 @@ env:
   #
 
   # Sourced from https://vulkan.lunarg.com/sdk/home#linux
-  VULKAN_SDK_VERSION: "1.3.268"
+  #
+  # We don't include the 4th version number, as it's not used in any URL.
+  VULKAN_SDK_VERSION: "1.3.290"
   # Sourced from https://www.nuget.org/packages/Microsoft.Direct3D.WARP
-  WARP_VERSION: "1.0.8"
+  WARP_VERSION: "1.0.13"
 
   # Sourced from https://github.com/microsoft/DirectXShaderCompiler/releases
   #
   # Must also be changed in shaders.yaml
-  DXC_RELEASE: "v1.7.2308"
-  DXC_FILENAME: "dxc_2023_08_14.zip"
+  DXC_RELEASE: "v1.8.2407"
+  DXC_FILENAME: "dxc_2024_07_31_clang_cl.zip"
 
   # Sourced from https://archive.mesa3d.org/. Bumping this requires
   # updating the mesa build in https://github.com/gfx-rs/ci-build and creating a new release.
-  MESA_VERSION: "23.3.1"
+  MESA_VERSION: "24.2.3"
   # Corresponds to https://github.com/gfx-rs/ci-build/releases
-  CI_BINARY_BUILD: "build18"
+  CI_BINARY_BUILD: "build19"
 
   # We sometimes need nightly to use special things in CI.
   #
@@ -311,7 +313,6 @@ jobs:
           rustup override set ${{ env.CORE_MSRV }}
           cargo -V
 
-      # Use special toolchain for rustdoc, see https://github.com/gfx-rs/wgpu/issues/4905
       - name: Install Nightly Toolchain
         run: |
           rustup toolchain install ${{ env.NIGHTLY_VERSION }} --no-self-update --profile=minimal --component clippy
@@ -442,7 +443,7 @@ jobs:
           dxc --version
 
           curl.exe -L --retry 5 https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/$WARP_VERSION -o warp.zip
-          7z.exe e warp.zip -owarp build/native/amd64/d3d10warp.dll
+          7z.exe e warp.zip -owarp build/native/bin/x64/d3d10warp.dll
 
           mkdir -p target/llvm-cov-target/debug/deps
 

diff --git a/.github/workflows/shaders.yml b/.github/workflows/shaders.yml
@@ -9,13 +9,17 @@ on:
 
 env:
   # Sourced from https://vulkan.lunarg.com/sdk/home#linux
-  VULKAN_SDK_VERSION: "1.3.268"
+  #
+  # We don't include the 4th version number, as it's not used in any URL.
+  #
+  # Held back from 1.3.290 by https://github.com/gfx-rs/wgpu/issues/6307
+  VULKAN_SDK_VERSION: "1.3.283"
 
   # Sourced from https://github.com/microsoft/DirectXShaderCompiler/releases
   #
   # Must also be changed in ci.yaml
-  DXC_RELEASE: "v1.7.2308"
-  DXC_FILENAME: "dxc_2023_08_14.zip"
+  DXC_RELEASE: "v1.8.2407"
+  DXC_FILENAME: "dxc_2024_07_31_clang_cl.zip"
 
 jobs:
   naga-validate-windows: