[libcamera-ci,3/4] Install documentation and lint packages in Debian 13 container only

26431 diff mbox series

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 <laurent.pinchart@ideasonboard.com>
---
 .gitlab-ci/setup-container.sh | 28 ++++++++++++----------------
 gitlab-ci.yml                 |  6 +++---
 2 files changed, 15 insertions(+), 19 deletions(-)

On Sun, Apr 05, 2026 at 10:22:07PM +0300, Laurent Pinchart wrote:
> 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.

This reduces the Debian 12 container size by more than 200MB, see
https://gitlab.freedesktop.org/pinchartl/libcamera/container_registry/47438

Debian 11 shows similar space savings.

> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  .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: