From patchwork Wed May 6 15:54:11 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 26641 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 4EF02C32F6 for ; Wed, 6 May 2026 15:55:33 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D349B63021; Wed, 6 May 2026 17:55:32 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="anyQplHs"; 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 D7F6262FE8 for ; Wed, 6 May 2026 17:55:31 +0200 (CEST) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:f191:8aa5:3091:a04d]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 6AC90C21; Wed, 6 May 2026 17:55:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1778082928; bh=juu51sQ7yb7m/tfnqcplXBc/jiwXhY8IGpK6X7gBvfU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=anyQplHsqnVZV7O/QMVAxNnw6yaU1zBNo7VtPUvBOg1oROSr6WUPjhXWZMbianXUF KFddbLrcBh6A9+RuiCOeRWmeiOX71BEyylY+yLvvhpiMAh0YXLFGEZAH1BkFWwhHqE eLDjw3bpOOd1uj/cFkWjYrMgGP6K/mxI4W1mNLVU= From: Stefan Klug To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug Subject: [PATCH v1 1/2] Split documentation build into separate build step Date: Wed, 6 May 2026 17:54:11 +0200 Message-ID: <20260506155442.1566744-2-stefan.klug@ideasonboard.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260506155442.1566744-1-stefan.klug@ideasonboard.com> References: <20260506155442.1566744-1-stefan.klug@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" Create a separate build step that builds the docs and merges the html docs and the api docs into a single docs directory. Drop the documentation build from the build-full step as it is no longer needed there. Signed-off-by: Stefan Klug --- .gitlab-ci/build-libcamera-docs.sh | 28 ++++++++++++++++++++++++++++ gitlab-ci.yml | 29 +++++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 4 deletions(-) create mode 100755 .gitlab-ci/build-libcamera-docs.sh diff --git a/.gitlab-ci/build-libcamera-docs.sh b/.gitlab-ci/build-libcamera-docs.sh new file mode 100755 index 000000000000..a2ee7ba839d8 --- /dev/null +++ b/.gitlab-ci/build-libcamera-docs.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +# SPDX-License-Identifier: GPL-2.0-or-later +# SPDX-FileCopyrightText: © 2023 Laurent Pinchart +# +# Build libcamera + +set -e + +source "$(dirname "$0")/lib.sh" +source "$(dirname "$0")/build-libcamera-common.sh" + +libcamera_build_docs() { + echo "Building libcamera" + + meson compile -C build -j$BUILD_CONCURRENT_JOBS documentation + ( + cd build + rm -rf docs + mv Documentation/html/ docs + rm -rf docs/{internal,public}-api + mv Documentation/{internal,public}-api docs/ + ) +} + +run libcamera_install_pkgs +run libcamera_setup +run libcamera_build_docs collapsed diff --git a/gitlab-ci.yml b/gitlab-ci.yml index f887e3b6c221..468f5769eb87 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -229,10 +229,6 @@ build-full:debian:13: - ARCH: amd64 CC: gcc-14 CXX: g++-14 - MESON_OPTIONS: >- - ${MESON_ALL_OPTIONS} - -D documentation=enabled - -D doc_werror=true - ARCH: amd64 CC: clang CXX: clang++ @@ -302,6 +298,31 @@ build-package:debug: - ARCH: amd64 - ARCH: arm64 +# Build documentation. +build-docs: + extends: + - .fdo.distribution-image@debian + - .libcamera-ci.debian:13 + - .libcamera-ci.scripts + stage: build + needs: + - job: container-debian:13 + artifacts: false + script: + - $CI_PROJECT_DIR/.gitlab-ci/build-libcamera-docs.sh + artifacts: + name: libcamera-docs-${CI_COMMIT_SHA} + when: always + expire_in: 1 week + paths: + - build/docs + variables: + BUILD_TYPE: release + MESON_OPTIONS: >- + ${MESON_ALL_OPTIONS} + -D documentation=enabled + -D doc_werror=true + # ------------------------------------------------------------------------------ # Lint stage - Run checkstyle.py and check merge suitability # ------------------------------------------------------------------------------