[CI] [PATCH v1 2/2] Add compilation tests on Debian 10

Laurent Pinchart laurent.pinchart at ideasonboard.com
Tue May 7 20:17:56 CEST 2024


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 <laurent.pinchart at ideasonboard.com>
---
 .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
-- 
Regards,

Laurent Pinchart



More information about the libcamera-devel mailing list