ci: build docs using meson
To avoid having to inflate the image here even further, let's just add what we need to the the normal x86 Alpine build image, and use that. Reviewed-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Eric Engestrom <eric@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11494>
This commit is contained in:
committed by
Marge Bot
parent
1e7636fbb1
commit
fdd204538b
@@ -29,11 +29,13 @@ DEPS=(
|
||||
git
|
||||
gettext
|
||||
glslang
|
||||
graphviz
|
||||
linux-headers
|
||||
llvm16-static
|
||||
llvm16-dev
|
||||
meson
|
||||
mold
|
||||
musl-dev
|
||||
expat-dev
|
||||
elfutils-dev
|
||||
libdrm-dev
|
||||
@@ -42,9 +44,11 @@ DEPS=(
|
||||
libpciaccess-dev
|
||||
zlib-dev
|
||||
python3-dev
|
||||
py3-clang
|
||||
py3-cparser
|
||||
py3-mako
|
||||
py3-packaging
|
||||
py3-pip
|
||||
py3-ply
|
||||
vulkan-headers
|
||||
spirv-tools-dev
|
||||
@@ -55,6 +59,8 @@ DEPS=(
|
||||
|
||||
apk --no-cache add "${DEPS[@]}" "${EPHEMERAL[@]}"
|
||||
|
||||
pip3 install --break-system-packages sphinx===5.1.1 hawkmoth===0.16.0
|
||||
|
||||
. .gitlab-ci/container/build-llvm-spirv.sh
|
||||
|
||||
. .gitlab-ci/container/build-libclc.sh
|
||||
|
||||
@@ -346,6 +346,12 @@ alpine/x86_64_build:
|
||||
- .alpine/x86_64_build-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &alpine-x86_64_build ${ALPINE_X86_64_BUILD_TAG}
|
||||
rules:
|
||||
- !reference [pages, rules]
|
||||
- !reference [test-docs, rules]
|
||||
- !reference [test-docs-mr, rules]
|
||||
- !reference [linkcheck-docs, rules]
|
||||
- !reference [.container, rules]
|
||||
|
||||
.use-alpine/x86_64_build:
|
||||
extends:
|
||||
|
||||
@@ -32,7 +32,7 @@ variables:
|
||||
DEBIAN_TEST_VK_TAG: "20240613-piglit-fd"
|
||||
KERNEL_ROOTFS_TAG: "20240613-piglit-fd"
|
||||
|
||||
ALPINE_X86_64_BUILD_TAG: "20240612-mold"
|
||||
ALPINE_X86_64_BUILD_TAG: "20240620-sphinx"
|
||||
ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"
|
||||
FEDORA_X86_64_BUILD_TAG: "20240612-mold"
|
||||
KERNEL_TAG: "v6.6.21-mesa-f8ea"
|
||||
|
||||
Reference in New Issue
Block a user