AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: bump ci-templates

Browse Source 
debian/x86_64_build-base was missing the package that provides
LLVMConfig.cmake, breaking cmake builds that need LLVM, like the
SPIRV-LLVM-Translator build.

The cross-builds were missing arch-test to allow dpkg to figure out
which arch it's running on.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31940>
This commit is contained in:
Eric Engestrom
2024-10-31 12:33:14 +01:00
committed by Marge Bot
parent 18b5108a3d
commit 4ec045a533
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -59,7 +59,7 @@ workflow:
variables: variables:
FDO_UPSTREAM_REPO: mesa/mesa FDO_UPSTREAM_REPO: mesa/mesa
MESA_TEMPLATES_COMMIT: &ci-templates-commit d5aa3941aa03c2f716595116354fb81eb8012acb MESA_TEMPLATES_COMMIT: &ci-templates-commit e195d80f35b45cc73668be3767b923fd76c70ed5
CI_PRE_CLONE_SCRIPT: |- CI_PRE_CLONE_SCRIPT: |-
set -o xtrace set -o xtrace
wget -q -O download-git-cache.sh ${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/download-git-cache.sh wget -q -O download-git-cache.sh ${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/download-git-cache.sh

1
.gitlab-ci/container/debian/x86_64_build-base.sh
View File

@@ -62,6 +62,7 @@ DEPS=(
libxtensor-dev libxtensor-dev
libxxf86vm-dev libxxf86vm-dev
libwayland-egl-backend-dev libwayland-egl-backend-dev
"llvm-${LLVM_VERSION}-dev"
make make
ninja-build ninja-build
openssh-server openssh-server

1
.gitlab-ci/container/lava_build.sh
View File

@@ -114,6 +114,7 @@ fi
# no need to remove these at end, image isn't saved at the end # no need to remove these at end, image isn't saved at the end
CONTAINER_EPHEMERAL=( CONTAINER_EPHEMERAL=(
arch-test
automake automake
bc bc
"clang-${LLVM_VERSION}" "clang-${LLVM_VERSION}"