From patchwork Sun Apr 5 19:22:07 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 26431 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 9FC5BC32BB for ; Sun, 5 Apr 2026 19:22:19 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 44C8862D7E; Sun, 5 Apr 2026 21:22:19 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="vd5+QUZA"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9E50B62D7A for ; Sun, 5 Apr 2026 21:22:16 +0200 (CEST) Received: from killaraus.ideasonboard.com (2001-14ba-703d-e500--2a1.rev.dnainternet.fi [IPv6:2001:14ba:703d:e500::2a1]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 69DD36AF for ; Sun, 5 Apr 2026 21:20:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1775416850; bh=GyQWsvFcduFI/g+c1IDcPmFIiSnQ8xbfvvjvW2Hrvxw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=vd5+QUZADu56U9K04qxxDzvfc1zpFoFhAvafnwaqusmmeF/wS15UJtJjTOEzIxSTm cvyMQf1DYz+ws5QNOrgXjybDRWB4t43HTf+qRR/KfSxFA5U46kFpCaxjHOPQfFwV6X hHjhIdDu9aj1KCRXjGIFUepKURKgndUYuN6LVtVs= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [libcamera-ci] [PATCH 3/4] Install documentation and lint packages in Debian 13 container only Date: Sun, 5 Apr 2026 22:22:07 +0300 Message-ID: <20260405192211.1210985-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260405192211.1210985-1-laurent.pinchart@ideasonboard.com> References: <20260405192211.1210985-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The documentation and lint packages are only needed by jobs running in the Debian 13 container. Install them there only to save space in other containers. Signed-off-by: Laurent Pinchart --- .gitlab-ci/setup-container.sh | 28 ++++++++++++---------------- gitlab-ci.yml | 6 +++--- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh index 35062719b5c4..103cc61169c3 100755 --- a/.gitlab-ci/setup-container.sh +++ b/.gitlab-ci/setup-container.sh @@ -35,28 +35,19 @@ PKGS_LIBCAMERA_CBUILD=( PKGS_LIBCAMERA_RUNTIME=( clang - clang-format cmake - doxygen g++ - ghostscript - graphviz meson ninja-build openssl pkg-config pybind11-dev - python3-autopep8 python3-dev python3-jinja2 python3-pyparsing python3-ply - python3-sphinx - python3-sphinxcontrib.doxylink python3-yaml qt6-tools-dev-tools - shellcheck - texlive-latex-extra ) PKGS_LIBCAMERA_RUNTIME_MULTIARCH=( @@ -110,9 +101,6 @@ PKGS_VIRTME_RUNTIME=( PKGS_PIP_MIN_VERSIONS=( 'meson meson 1.2.0 remove' - 'python3-pygments pygments 2.10.0 keep' - 'python3-sphinx-book-theme sphinx-book-theme 0.1.7 remove' - 'python3-sphinxcontrib.doxylink sphinxcontrib-doxylink 1.6.1 remove' ) archs=( amd64 ) @@ -126,8 +114,6 @@ case $FDO_DISTRIBUTION_VERSION in PKGS_LIBCAMERA_RUNTIME+=( g++-9 ) ;; 'bookworm') - # Sphinx theme for the documentation. - PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme ) # libclang-rt-dev for the clang ASan runtime. PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev ) # For the Android camera HAL and the virtual pipeline handler. @@ -136,8 +122,18 @@ case $FDO_DISTRIBUTION_VERSION in 'trixie') # gcc 13 to expand compilation testing coverage. PKGS_LIBCAMERA_RUNTIME+=( g++-13 ) - # Sphinx theme for the documentation. - PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme ) + # Packages required to builf the documentation. + PKGS_LIBCAMERA_RUNTIME+=( + doxygen + ghostscript + graphviz + python3-sphinx + python3-sphinx-book-theme + python3-sphinxcontrib.doxylink + texlive-latex-extra + ) + # Tools requires by the lint jobs. + PKGS_LIBCAMERA_RUNTIME+=( clang-format python3-autopep8 shellcheck ) # libclang-rt-dev for the clang ASan runtime. PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-19-dev ) # For the Android camera HAL and the virtual pipeline handler. diff --git a/gitlab-ci.yml b/gitlab-ci.yml index 08fc841e4c48..6679cf853c7a 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -64,17 +64,17 @@ include: .libcamera-ci.debian:11: variables: FDO_DISTRIBUTION_VERSION: 'bullseye' - FDO_DISTRIBUTION_TAG: '2025-09-12.2' + FDO_DISTRIBUTION_TAG: '2026-04-05.0' .libcamera-ci.debian:12: variables: FDO_DISTRIBUTION_VERSION: 'bookworm' - FDO_DISTRIBUTION_TAG: '2026-01-23.0' + FDO_DISTRIBUTION_TAG: '2026-04-05.0' .libcamera-ci.debian:13: variables: FDO_DISTRIBUTION_VERSION: 'trixie' - FDO_DISTRIBUTION_TAG: '2026-01-23.1' + FDO_DISTRIBUTION_TAG: '2026-04-05.0' .container-debian: extends: