diff options
| author | Daniel Stone <daniels@collabora.com> | 2021-08-16 16:49:52 +0100 |
|---|---|---|
| committer | Marius Vlad <marius.vlad@collabora.com> | 2021-11-25 10:55:31 +0200 |
| commit | 4564b799b8765df48715d73bfb4312d848c9453d (patch) | |
| tree | c98dbf624f741c5691410d670b7926a304f1fbc3 /.gitlab-ci.yml | |
| parent | 753b6656fee3da6872e32d44eb75492ad45330a3 (diff) | |
| download | weston-4564b799b8765df48715d73bfb4312d848c9453d.tar.gz | |
ci: Move Debian from Buster to Bullseye
Now Debian 11 (Bullseye) has been released, shift our CI builds to using
that instead of the older Buster.
Due to dependency-chain changes, we have to install a lot more packages
explicitly and retain more at runtime. This is exacerbated by pkg-config
now requiring the entire chain to be installed, not just the immediate
dependencies.
Our documentation toolchain also gets bumped to a higher version to deal
with Doxygen changes.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90fd9d57..c238e433 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ variables: FDO_UPSTREAM_REPO: wayland/weston FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH" - FDO_DISTRIBUTION_TAG: '2021-11-24.0-kernel-v5.14' + FDO_DISTRIBUTION_TAG: '2021-11-25.2-bullseye-sphinx' include: @@ -74,7 +74,7 @@ stages: .os-debian: variables: BUILD_OS: debian - FDO_DISTRIBUTION_VERSION: buster + 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' .ci-rules: @@ -170,8 +170,8 @@ aarch64-debian-container_prep: .build-with-clang: variables: - CC: clang-8 - CC_LD: lld-8 + CC: clang-11 + CC_LD: lld-11 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 |