From patchwork Tue May 7 18:17:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 20010 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 6F715C32B5 for ; Tue, 7 May 2024 18:18:11 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 586E06343F; Tue, 7 May 2024 20:18:10 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="OcHQJm1M"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 074F2633E4 for ; Tue, 7 May 2024 20:18:07 +0200 (CEST) Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A1E7D904 for ; Tue, 7 May 2024 20:18:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1715105884; bh=4nQyNeMA1akPrEHbMod5ITiKddo0eo7ktsGvPUUr/uU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=OcHQJm1MQH1X+OzfRFKaxgmu7kNR5Buf0AZwJz72yun26YM6MPCJybxrgd/r33/94 dU81hVg+osIcZaUWzWtogb5KIR63wmYwBh2oJHkgeN8snUJZTr6myfkLNkiCe3Me/F UEtoABxfghtM6JaFbRxzc6rHTiq3tcU/2+YMvKSM= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [CI] [PATCH v1 2/2] Add compilation tests on Debian 10 Date: Tue, 7 May 2024 21:17:56 +0300 Message-ID: <20240507181756.32635-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240507181756.32635-1-laurent.pinchart@ideasonboard.com> References: <20240507181756.32635-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" A recent compilation breakage was introduced in the libcamera master branch, and wasn't detected in CI due to missing compilation tests with Debian 10. Fix this, and test both gcc 9 and gcc 10 as we support both versions. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- .gitlab-ci/setup-container.sh | 5 +++++ gitlab-ci.yml | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh index 7ed00c58a177..6f75c3209eb7 100755 --- a/.gitlab-ci/setup-container.sh +++ b/.gitlab-ci/setup-container.sh @@ -92,6 +92,11 @@ archs=( amd64 ) declare -A components +# On Debian bullseye, install gcc 9 in addition to the default gcc 10. +if [[ $FDO_DISTRIBUTION_VERSION == 'bullseye' ]] ; then + PKGS_LIBCAMERA_RUNTIME+=( g++-9 ) +fi + # We use Debian bookworm containers to produce ARM binaries and run unit tests # with virtme, and other Debian versions for compilation-testing on amd64 only. if [[ $FDO_DISTRIBUTION_VERSION == 'bookworm' ]] ; then diff --git a/gitlab-ci.yml b/gitlab-ci.yml index 225d929bd2ed..dc8d6bba3672 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -55,6 +55,11 @@ include: FDO_DISTRIBUTION_VERSION: 'buster' FDO_DISTRIBUTION_TAG: '2024-04-18.0' +.libcamera-ci.debian:11: + variables: + FDO_DISTRIBUTION_VERSION: 'bullseye' + FDO_DISTRIBUTION_TAG: '2024-05-07.1' + .libcamera-ci.debian:12: variables: FDO_DISTRIBUTION_VERSION: 'bookworm' @@ -85,6 +90,11 @@ container-debian:10: - .container-debian - .libcamera-ci.debian:10 +container-debian:11: + extends: + - .container-debian + - .libcamera-ci.debian:11 + container-debian:12: extends: - .container-debian @@ -150,6 +160,22 @@ build-full:debian:10: CC: gcc-8 CXX: g++-8 +build-full:debian:11: + extends: + - .libcamera-ci.debian:11 + - .build-full:debian + needs: + - job: container-debian:11 + artifacts: false + parallel: + matrix: + - ARCH: amd64 + CC: gcc-9 + CXX: g++-9 + - ARCH: amd64 + CC: gcc-10 + CXX: g++-10 + build-full:debian:12: extends: - .libcamera-ci.debian:12