fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 07:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ci/alpine: install the real ninja package

Browse source 
The `samurai` re-implementation that we'd been using is missing the
tools, in particular `missingdeps` which we're about to start using, so
let's not leave alpine out.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37490>
This commit is contained in:
Eric Engestrom 2025-09-20 11:41:42 +02:00 • committed by Marge Bot
parent 3f40a7d998
commit e17469f99f
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci/container/alpine/x86_64_build.sh
View file

@ -42,6 +42,7 @@ DEPS=(
"llvm${LLVM_VERSION}-static" "llvm${LLVM_VERSION}-static"
mold mold
musl-dev musl-dev
ninja-build
py3-clang py3-clang
py3-cparser py3-cparser
py3-mako py3-mako
@ -50,7 +51,6 @@ DEPS=(
py3-ply py3-ply
py3-yaml py3-yaml
python3-dev python3-dev
samurai
spirv-llvm-translator-dev spirv-llvm-translator-dev
spirv-tools-dev spirv-tools-dev
util-macros util-macros
@ -60,6 +60,10 @@ DEPS=(
apk --no-cache add "${DEPS[@]}" "${EPHEMERAL[@]}" apk --no-cache add "${DEPS[@]}" "${EPHEMERAL[@]}"
# shellcheck disable=2016 # we're not trying to evaluate $PATH now
echo 'export PATH="/usr/lib/ninja-build/bin/:$PATH"' > /etc/profile.d/ninja-path.sh
source /etc/profile.d/ninja-path.sh
pip3 install --break-system-packages sphinx===8.2.3 hawkmoth===0.19.0 pip3 install --break-system-packages sphinx===8.2.3 hawkmoth===0.19.0
. .gitlab-ci/container/container_pre_build.sh . .gitlab-ci/container/container_pre_build.sh

2
.gitlab-ci/image-tags.yml
View file

@ -28,7 +28,7 @@ variables:
DEBIAN_TEST_VIDEO_TAG: "20250813-vector" DEBIAN_TEST_VIDEO_TAG: "20250813-vector"
DEBIAN_TEST_VK_TAG: "20250930-piglit-a7" DEBIAN_TEST_VK_TAG: "20250930-piglit-a7"
ALPINE_X86_64_BUILD_TAG: "20250917-rust" ALPINE_X86_64_BUILD_TAG: "20251001-realninja"
FEDORA_X86_64_BUILD_TAG: "20250917-rust" FEDORA_X86_64_BUILD_TAG: "20250917-rust"