diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1663ecdf0..e0adc798f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ variables: FDO_UPSTREAM_REPO: wayland/weston FDO_REPO_SUFFIX: "$BUILD_OS-$FDO_DISTRIBUTION_VERSION/$BUILD_ARCH" - FDO_DISTRIBUTION_TAG: '2025-12-10-linux-6.18' + FDO_DISTRIBUTION_TAG: '2025-12-16-bump-to-trixie' include: @@ -93,20 +93,23 @@ stages: .os-debian-lts: variables: BUILD_OS: debian - LLVM_VERSION: 11 + LLVM_VERSION: 15 + USE_DEBIAN_BACKPORTS: y + PACKAGES_SPECIFIC: vulkan-validationlayers-dev FREERDP_VERSION: 2 - 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} LLVM_VERSION=${LLVM_VERSION} FDO_DISTRIBUTION_VERSION=${FDO_DISTRIBUTION_VERSION} bash .gitlab-ci/debian-install.sh' + FDO_DISTRIBUTION_VERSION: bookworm + 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} FDO_DISTRIBUTION_VERSION=${FDO_DISTRIBUTION_VERSION} PACKAGES_SPECIFIC="${PACKAGES_SPECIFIC}" bash .gitlab-ci/debian-install.sh' .os-debian: variables: BUILD_OS: debian - LLVM_VERSION: 15 + LLVM_VERSION: 19 FREERDP_VERSION: 3 - USE_BOOKWORM_BACKPORTS: y - # If you upgrade from bookworm, see the use_tls=0 notes in tests/meson.build. - FDO_DISTRIBUTION_VERSION: bookworm - 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} FDO_DISTRIBUTION_VERSION=${FDO_DISTRIBUTION_VERSION} bash .gitlab-ci/debian-install.sh' + USE_DEBIAN_BACKPORTS: y + PACKAGES_SPECIFIC: vulkan-utility-libraries-dev libpolly-19-dev libclang-rt-19-dev python3-standard-imghdr + # If you upgrade from trixie, see the use_tls=0 notes in tests/meson.build. + FDO_DISTRIBUTION_VERSION: trixie + 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} FDO_DISTRIBUTION_VERSION=${FDO_DISTRIBUTION_VERSION} PACKAGES_SPECIFIC="${PACKAGES_SPECIFIC}" bash .gitlab-ci/debian-install.sh' # Does not inherit .default-rules as we only want it to run in MR context. check-commit: @@ -452,11 +455,6 @@ aarch64-debian-container_prep: x86_64-debian-lts-full-build: extends: - .test-env-debian-lts-x86_64 - - .build-options-full-v2 - -x86_64-debian-full-build: - extends: - - .test-env-debian-x86_64 - .build-options-full artifacts: reports: @@ -464,6 +462,11 @@ x86_64-debian-full-build: coverage_format: cobertura path: $BUILDDIR/meson-logs/coverage.xml +x86_64-debian-full-build: + extends: + - .test-env-debian-x86_64 + - .build-options-full-v2 + aarch64-debian-lts-full-build: extends: - .test-env-debian-lts-aarch64 @@ -609,18 +612,18 @@ x86_64-debian-no-vulkan-build: docs-and-coverage: extends: - .default-rules - - .debian-x86_64 + - .debian-lts-x86_64 - .fdo.suffixed-image@debian stage: pages needs: - job: docs-build artifacts: true - - job: x86_64-debian-full-build + - job: x86_64-debian-lts-full-build artifacts: true timeout: 5m script: - mv prefix-weston-docs-build/share/doc/weston Documentation - - mv build-weston-x86_64-debian-full-build/meson-logs/coveragereport Test_Coverage + - mv build-weston-x86_64-debian-lts-full-build/meson-logs/coveragereport Test_Coverage - rm Test_Coverage/gcov.css - cp doc/style/lcov-style.css Test_Coverage/gcov.css - cp doc/style/*.png Test_Coverage/ diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index ad143d1b8..fbbee350c 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -38,9 +38,10 @@ MESA_RUNTIME_PKGS=" libllvm${LLVM_VERSION} " -if [ x"$USE_BOOKWORM_BACKPORTS" = "xy" ] ; then - echo 'deb http://deb.debian.org/debian bookworm-backports main' >> /etc/apt/sources.list +if [ x"$USE_DEBIAN_BACKPORTS" = "xy" ] ; then + echo 'deb http://deb.debian.org/debian '${FDO_DISTRIBUTION_VERSION}'-backports main' >> /etc/apt/sources.list fi + apt-get update apt-get -y --no-install-recommends install \ autoconf \ @@ -67,7 +68,7 @@ apt-get -y --no-install-recommends install \ libexpat1-dev \ libffi-dev \ libgbm-dev \ - libgdk-pixbuf2.0-dev \ + libgdk-pixbuf-xlib-2.0-dev \ libgles2-mesa-dev \ libglu1-mesa-dev \ libgstreamer1.0-dev \ @@ -124,7 +125,6 @@ apt-get -y --no-install-recommends install \ python3-setuptools \ qemu-system \ sysvinit-core \ - vulkan-validationlayers-dev \ x11proto-dev \ xwayland \ python3-argcomplete \ @@ -134,6 +134,7 @@ apt-get -y --no-install-recommends install \ $MESA_DEV_PKGS \ $BUILD_DEV_PKGS \ $MESA_RUNTIME_PKGS \ + $PACKAGES_SPECIFIC \ $LINUX_DEV_PKGS \ if [ "$FREERDP_VERSION" -ne 0 ] ; then diff --git a/tests/meson.build b/tests/meson.build index ad46afae9..ff4632770 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -432,7 +432,7 @@ test_env = {} # program exit when it scans for leaks. Due to use_tls=0 even more # suppressions had to be added. # TODO XXX: Try to revert the addition of use_tls=0 when our CI image -# upgrades from Debian Bookworm to something more recent. +# upgrades from Debian Trixie to something more recent. if get_option('b_sanitize') in ['address', 'address,undefined' ] test_env += { 'LSAN_OPTIONS': 'use_tls=0:suppressions=@0@'.format(dir_gitlab_ci / 'leak-sanitizer.supp') } endif