Module: Mesa Branch: main Commit: 86785130d18a1e6c603dfbf57559aa2a8a748295 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=86785130d18a1e6c603dfbf57559aa2a8a748295
Author: Sil Vilerino <[email protected]> Date: Wed Jun 21 15:05:15 2023 -0700 CI/windows: Update headers and Agility redist to 1.711.3-preview Reviewed-by: Jesse Natalie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23811> --- .gitlab-ci/container/debian/x86_64_build.sh | 2 +- .gitlab-ci/image-tags.yml | 4 ++-- .gitlab-ci/windows/mesa_deps_build.ps1 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/container/debian/x86_64_build.sh b/.gitlab-ci/container/debian/x86_64_build.sh index 77be2bad825..dc67396c14f 100644 --- a/.gitlab-ci/container/debian/x86_64_build.sh +++ b/.gitlab-ci/container/debian/x86_64_build.sh @@ -81,7 +81,7 @@ cd shader-db make popd -git clone https://github.com/microsoft/DirectX-Headers -b v1.610.0 --depth 1 +git clone https://github.com/microsoft/DirectX-Headers -b v1.711.3-preview --depth 1 pushd DirectX-Headers meson setup build --backend=ninja --buildtype=release -Dbuild-test=false meson install -C build diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 3ec18385d95..1c35201e3bd 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -3,7 +3,7 @@ variables: DEBIAN_BASE_TAG: "2023-06-21-virglrenderer" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" - DEBIAN_BUILD_TAG: "2023-06-23-bindgen-bump" + DEBIAN_BUILD_TAG: "2023-06-24-agility-711" DEBIAN_X86_64_BUILD_MINGW_IMAGE_PATH: "debian/x86_64_build-mingw" DEBIAN_BUILD_MINGW_TAG: "2023-05-25-bookworm" @@ -27,7 +27,7 @@ variables: WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib" WINDOWS_X64_BUILD_PATH: "windows/x64_build" - WINDOWS_X64_BUILD_TAG: "2023-04-13-agility-610" + WINDOWS_X64_BUILD_TAG: "2023-06-24-agility-711" WINDOWS_X64_TEST_PATH: "windows/x64_test" WINDOWS_X64_TEST_TAG: "2023-05-30-warp-1.0.7.1" diff --git a/.gitlab-ci/windows/mesa_deps_build.ps1 b/.gitlab-ci/windows/mesa_deps_build.ps1 index 0f97a92ec18..8872ae2f585 100644 --- a/.gitlab-ci/windows/mesa_deps_build.ps1 +++ b/.gitlab-ci/windows/mesa_deps_build.ps1 @@ -12,7 +12,7 @@ $depsInstallPath="C:\mesa-deps" Get-Date Write-Host "Cloning DirectX-Headers" -git clone -b v1.610.0 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers +git clone -b v1.711.3-preview --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers if (!$?) { Write-Host "Failed to clone DirectX-Headers repository" Exit 1
