OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Always install glslangValidator for build jobs

Browse Source 
Signed-off-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15648>
This commit is contained in:
Konstantin Seurer
2022-04-24 15:11:37 +02:00
parent 6bef59f56b
commit 8cb92ce94e
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci/container/debian/arm_build.sh
View File

@@ -22,6 +22,7 @@ apt-get -y install \
flex \ flex \
g++ \ g++ \
git \ git \
glslang-tools \
kmod \ kmod \
libasan6 \ libasan6 \
libdrm-dev \ libdrm-dev \

1
.gitlab-ci/container/fedora/x86_build.sh
View File

@@ -25,6 +25,7 @@ dnf install -y --setopt=install_weak_deps=False \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
gettext \ gettext \
glslang \
kernel-headers \ kernel-headers \
llvm-devel \ llvm-devel \
clang-devel \ clang-devel \

6
.gitlab-ci/image-tags.yml
View File

@@ -1,9 +1,9 @@
variables: variables:
DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
DEBIAN_BASE_TAG: "2022-02-21-libdrm" DEBIAN_BASE_TAG: "2022-04-24-libdrm"
DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
DEBIAN_BUILD_TAG: "2022-02-21-libdrm" DEBIAN_BUILD_TAG: "2022-04-24-libdrm"
DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base" DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
@@ -11,7 +11,7 @@ variables:
DEBIAN_X86_TEST_GL_TAG: "2022-04-07-virgl-crosvm" DEBIAN_X86_TEST_GL_TAG: "2022-04-07-virgl-crosvm"
DEBIAN_X86_TEST_VK_TAG: "2022-04-05-deqp-runner" DEBIAN_X86_TEST_VK_TAG: "2022-04-05-deqp-runner"
FEDORA_X86_BUILD_TAG: "2022-03-18-spirv-tools-5" FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5"
KERNEL_ROOTFS_TAG: "2022-04-09-prefix-skqp" KERNEL_ROOTFS_TAG: "2022-04-09-prefix-skqp"
WINDOWS_X64_BUILD_PATH: "windows/x64_build" WINDOWS_X64_BUILD_PATH: "windows/x64_build"