Mesa (master): CI: Install DirectX-Headers package for x86 container

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 7452a96e91c096a996ddc73e0a207ed5d5311933
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7452a96e91c096a996ddc73e0a207ed5d5311933

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Mon Dec 28 11:21:06 2020 -0800

CI: Install DirectX-Headers package for x86 container

Acked-by: Daniel Stone <daniels at collabora.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8251>

---

 .gitlab-ci.yml                    | 2 +-
 .gitlab-ci/container/x86_build.sh | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e1294d360e..11f18079971 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -277,7 +277,7 @@ x86_build:
   extends:
     - .use-x86_build-base
   variables:
-    MESA_IMAGE_TAG: &x86_build "2020-12-17-use-ephemeral"
+    MESA_IMAGE_TAG: &x86_build "2021-1-4-directx-headers"
 
 .use-x86_build:
   variables:
diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh
index 5f68005fec9..c9fb88d43a2 100644
--- a/.gitlab-ci/container/x86_build.sh
+++ b/.gitlab-ci/container/x86_build.sh
@@ -117,6 +117,15 @@ cd shader-db
 make
 popd
 
+git clone https://github.com/microsoft/DirectX-Headers -b v1.0.1 --depth 1
+pushd DirectX-Headers
+mkdir build
+cd build
+meson .. --backend=ninja --buildtype=release -Dbuild-test=false
+ninja
+ninja install
+popd
+rm -rf DirectX-Headers
 
 ############### Uninstall the build software