diff --git a/.gitlab-ci/container/alpine/x86_64_build.sh b/.gitlab-ci/container/alpine/x86_64_build.sh index 6558602fe7a..0e6d9559dcf 100644 --- a/.gitlab-ci/container/alpine/x86_64_build.sh +++ b/.gitlab-ci/container/alpine/x86_64_build.sh @@ -42,6 +42,7 @@ DEPS=( "llvm${LLVM_VERSION}-static" mold musl-dev + ninja-build py3-clang py3-cparser py3-mako @@ -50,7 +51,6 @@ DEPS=( py3-ply py3-yaml python3-dev - samurai spirv-llvm-translator-dev spirv-tools-dev util-macros @@ -60,6 +60,10 @@ DEPS=( 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 . .gitlab-ci/container/container_pre_build.sh diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 755838cbdaa..1c30cd1c7f5 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -28,7 +28,7 @@ variables: DEBIAN_TEST_VIDEO_TAG: "20250813-vector" 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"