Mesa (main): CI: Update DirectX-Headers dependency for MinGW/Debian

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: f4a5e95ad268808152aca5ce398fb36c55f85b04
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f4a5e95ad268808152aca5ce398fb36c55f85b04

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Thu Jul 14 14:55:14 2022 -0700

CI: Update DirectX-Headers dependency for MinGW/Debian

Reviewed-by: Bill Kristiansen <billkris at microsoft.com>
Reviewed-by: Sil Vilerino <sivileri at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17548>

---

 .gitlab-ci/container/debian/x86_build-mingw-source-deps.sh | 2 +-
 .gitlab-ci/container/debian/x86_build.sh                   | 2 +-
 .gitlab-ci/image-tags.yml                                  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh b/.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh
index 0fee1723da6..134715cb980 100644
--- a/.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh
+++ b/.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh
@@ -5,7 +5,7 @@ mkdir -p ~/tmp
 pushd ~/tmp
 
 # Building DirectX-Headers
-git clone https://github.com/microsoft/DirectX-Headers -b mesa-mingw --depth 1
+git clone https://github.com/microsoft/DirectX-Headers -b v1.606.3 --depth 1
 mkdir -p DirectX-Headers/build
 pushd DirectX-Headers/build
 meson .. \
diff --git a/.gitlab-ci/container/debian/x86_build.sh b/.gitlab-ci/container/debian/x86_build.sh
index 56bf406203c..80476e68eb0 100644
--- a/.gitlab-ci/container/debian/x86_build.sh
+++ b/.gitlab-ci/container/debian/x86_build.sh
@@ -74,7 +74,7 @@ cd shader-db
 make
 popd
 
-git clone https://github.com/microsoft/DirectX-Headers -b mesa-mingw --depth 1
+git clone https://github.com/microsoft/DirectX-Headers -b v1.606.3 --depth 1
 mkdir -p DirectX-Headers/build
 pushd DirectX-Headers/build
 meson .. --backend=ninja --buildtype=release -Dbuild-test=false
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index a6469ce35a6..45f246659c2 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -3,10 +3,10 @@ variables:
    DEBIAN_BASE_TAG: "2022-07-01-bb-llvm13"
 
    DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
-   DEBIAN_BUILD_TAG: "2022-07-01-db-llvm13"
+   DEBIAN_BUILD_TAG: "2022-07-14-directx-headers"
 
    DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
-   DEBIAN_BUILD_MINGW_TAG: "2022-07-01-dmgw-llvm13"
+   DEBIAN_BUILD_MINGW_TAG: "2022-07-14-directx-headers"
 
    DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"