[libcamera-ci,v1] setup-container: Update bullseye-backports
diff mbox series

Message ID 20250725090922.2486359-1-barnabas.pocze@ideasonboard.com
State Superseded
Headers show
Series
  • [libcamera-ci,v1] setup-container: Update bullseye-backports
Related show

Commit Message

Barnabás Pőcze July 25, 2025, 9:09 a.m. UTC 
bullseye-backports has reached end-of-life[0]. So update the address for
the package repository, rebuild the container as well.

This also necessitates changes in the gcc 13 build since gcc 13 not being
the native compiler for debian 13 now fails to link against the gcc 14
compiled static gtest libraries since it refers to new symbols. Solve this
by forcing meson to fall back to the wrap dependency.

[0]: https://lists.debian.org/debian-backports-announce/2024/07/msg00000.html

Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
---
 .gitlab-ci/setup-container.sh | 2 +-
 gitlab-ci.yml                 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

--
2.50.1

Patch
diff mbox series 

diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh
index 8d29e1c..5e9b89d 100755
--- a/.gitlab-ci/setup-container.sh
+++ b/.gitlab-ci/setup-container.sh
@@ -145,7 +145,7 @@  cbuild_install_pkgs() {
 	# The qt6-tools-dev-tools package is only available for bullseye in the
 	# backports repository. Enable backports only for that version.
 	if [[ $FDO_DISTRIBUTION_VERSION == 'bullseye' ]] ; then
-		echo "deb http://deb.debian.org/debian bullseye-backports main" \
+		echo "deb http://archive.debian.org/debian bullseye-backports main" \
 		       > /etc/apt/sources.list.d/bullseye-backports.list
 		apt update
 	fi
diff --git a/gitlab-ci.yml b/gitlab-ci.yml
index 6dfe4f4..3370176 100644
--- a/gitlab-ci.yml
+++ b/gitlab-ci.yml
@@ -60,7 +60,7 @@  include:
 .libcamera-ci.debian:11:
   variables:
     FDO_DISTRIBUTION_VERSION: 'bullseye'
-    FDO_DISTRIBUTION_TAG: '2025-02-27.1'
+    FDO_DISTRIBUTION_TAG: '2025-07-24.1'

 .libcamera-ci.debian:12:
   variables:
@@ -224,6 +224,7 @@  build-full:debian:13:
         MESON_OPTIONS: >-
           ${MESON_ALL_OPTIONS}
           -D cpp_std=c++20
+          -D force_fallback_for=['gtest']
       - ARCH: amd64
         CC: gcc-14
         CXX: g++-14