system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-10-03 02:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: Parameterise LLVM version

Browse source 
Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2023-05-17 12:22:26 +01:00
parent 5ccb33ac02
commit ef55d79727
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitlab-ci.yml
View file

@ -74,8 +74,9 @@ stages:
.os-debian: .os-debian:
variables: variables:
BUILD_OS: debian BUILD_OS: debian
LLVM_VERSION: 11
FDO_DISTRIBUTION_VERSION: bullseye FDO_DISTRIBUTION_VERSION: bullseye
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} BUILD_ARCH=${BUILD_ARCH} KERNEL_IMAGE=${KERNEL_IMAGE} KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG} bash .gitlab-ci/debian-install.sh' FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} BUILD_ARCH=${BUILD_ARCH} KERNEL_IMAGE=${KERNEL_IMAGE} KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG} LLVM_VERSION=$(LLVM_VERSION} bash .gitlab-ci/debian-install.sh'
.ci-rules: .ci-rules:
rules: rules:
@ -170,8 +171,8 @@ aarch64-debian-container_prep:
.build-with-clang: .build-with-clang:
variables: variables:
CC: clang-11 CC: clang-$LLVM_VERSION
CC_LD: lld-11 CC_LD: lld-$LLVM_VERSION
MESON_TOOLCHAIN_OPTIONS: "$MESON_OPTIONS -Db_lundef=false" # clang+ASan+undef=boom MESON_TOOLCHAIN_OPTIONS: "$MESON_OPTIONS -Db_lundef=false" # clang+ASan+undef=boom
# Extends the core build templates to also provide for running our testing. We # Extends the core build templates to also provide for running our testing. We

12
.gitlab-ci/debian-install.sh
View file

@ -22,13 +22,13 @@ MESA_DEV_PKGS="
libxrandr-dev libxrandr-dev
libxshmfence-dev libxshmfence-dev
libxrandr-dev libxrandr-dev
llvm-11-dev llvm-${LLVM_VERSION}-dev
python3-mako python3-mako
" "
# Needed for running the custom-built mesa # Needed for running the custom-built mesa
MESA_RUNTIME_PKGS=" MESA_RUNTIME_PKGS="
libllvm11 libllvm${LLVM_VERSION}
" "
apt-get update apt-get update
@ -36,7 +36,7 @@ apt-get -y --no-install-recommends install \
autoconf \ autoconf \
automake \ automake \
build-essential \ build-essential \
clang-11 \ clang-${LLVM_VERSION} \
curl \ curl \
doxygen \ doxygen \
graphviz \ graphviz \
@ -103,9 +103,9 @@ apt-get -y --no-install-recommends install \
libxkbcommon-dev \ libxkbcommon-dev \
libxml2-dev \ libxml2-dev \
libxxf86vm-dev \ libxxf86vm-dev \
lld-11 \ lld-${LLVM_VERSION} \
llvm-11 \ llvm-${LLVM_VERSION} \
llvm-11-dev \ llvm-${LLVM_VERSION}-dev \
mesa-common-dev \ mesa-common-dev \
ninja-build \ ninja-build \
pkg-config \ pkg-config \