summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorJesse Natalie <jenatali@microsoft.com>2022-08-31 12:32:33 -0700
committerMarge Bot <emma+marge@anholt.net>2022-10-20 00:30:21 +0000
commit18683917327edd79605752271f52a99fab1d8678 (patch)
treec08c21811f075b1c4e2258a6a6383cbebc33036f /.gitlab-ci
parent91085bf3379fa32d2cd3f164c8e84542b94baaab (diff)
downloadmesa-18683917327edd79605752271f52a99fab1d8678.tar.gz
mesa-18683917327edd79605752271f52a99fab1d8678.tar.bz2
mesa-18683917327edd79605752271f52a99fab1d8678.zip
deps: Update DirectX-Headers req to 1.606.4
Reviewed-by: Sil Vilerino <sivileri@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18305>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh2
-rw-r--r--.gitlab-ci/container/debian/x86_build.sh2
-rw-r--r--.gitlab-ci/image-tags.yml4
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 e42a65f33ca..dc3dc34e839 100644
--- a/.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh
+++ b/.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh
@@ -12,7 +12,7 @@ mkdir -p ~/tmp
pushd ~/tmp
# Building DirectX-Headers
-git clone https://github.com/microsoft/DirectX-Headers -b v1.606.3 --depth 1
+git clone https://github.com/microsoft/DirectX-Headers -b v1.606.4 --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 afcf13d1d35..2932f983e51 100644
--- a/.gitlab-ci/container/debian/x86_build.sh
+++ b/.gitlab-ci/container/debian/x86_build.sh
@@ -83,7 +83,7 @@ cd shader-db
make
popd
-git clone https://github.com/microsoft/DirectX-Headers -b v1.606.3 --depth 1
+git clone https://github.com/microsoft/DirectX-Headers -b v1.606.4 --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 3be5bdabe7f..8faf36cb888 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -3,10 +3,10 @@ variables:
DEBIAN_BASE_TAG: "2022-10-04-vn-render-server"
DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
- DEBIAN_BUILD_TAG: "2022-09-30-mkbootimg"
+ DEBIAN_BUILD_TAG: "2022-10-18-dx-headers"
DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
- DEBIAN_BUILD_MINGW_TAG: "2022-10-17-add-libdrm-libva-deps.3"
+ DEBIAN_BUILD_MINGW_TAG: "2022-10-18-dx-headers-va"
DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"