| Message ID | 20260405192211.1210985-3-laurent.pinchart@ideasonboard.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
2026. 04. 05. 21:22 keltezéssel, Laurent Pinchart írta: > Debian 13 being the current stable release, use it for the history build > job and for the lint jobs, as well as for building documentation. > > For the lint jobs this brings the features of the latest version of the > lint tools, while for the history build and documentation build it > simply defaults to the latest stable distribution version. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- Looks ok to me. Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> > gitlab-ci.yml | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/gitlab-ci.yml b/gitlab-ci.yml > index c3a2cf5fe7ac..08fc841e4c48 100644 > --- a/gitlab-ci.yml > +++ b/gitlab-ci.yml > @@ -182,10 +182,6 @@ build-full:debian:12: > BUILD_TYPE: debug > CC: gcc-12 > CXX: g++-12 > - MESON_OPTIONS: >- > - ${MESON_ALL_OPTIONS} > - -D documentation=enabled > - -D doc_werror=true > - ARCH: amd64 > BUILD_TYPE: release > CC: gcc-12 > @@ -232,6 +228,10 @@ 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++ > @@ -248,11 +248,11 @@ build-history: > extends: > - .fdo.distribution-image@debian > - .history-jobs > - - .libcamera-ci.debian:12 > + - .libcamera-ci.debian:13 > - .libcamera-ci.scripts > stage: build > needs: > - - job: container-debian:12 > + - job: container-debian:13 > artifacts: false > script: > - $CI_PROJECT_DIR/.gitlab-ci/build-libcamera-history.sh > @@ -309,11 +309,11 @@ lint: > extends: > - .fdo.distribution-image@debian > - .history-jobs > - - .libcamera-ci.debian:12 > + - .libcamera-ci.debian:13 > - .libcamera-ci.scripts > stage: lint > needs: > - - job: container-debian:12 > + - job: container-debian:13 > artifacts: false > # checkstyle.py produces lots of false positives, its output is more > # informational than normative. > @@ -325,14 +325,14 @@ merge-check: > extends: > - .fdo.distribution-image@debian > - .history-jobs > - - .libcamera-ci.debian:12 > + - .libcamera-ci.debian:13 > - .libcamera-ci.scripts > stage: lint > # Patches may be pushed before they are fully tagged. Do not mark pre-review > # development as a failure, but provide warnings on what is required. > allow_failure: true > needs: > - - job: container-debian:12 > + - job: container-debian:13 > artifacts: false > script: > - $CI_PROJECT_DIR/.gitlab-ci/lint-pre-push.sh
diff --git a/gitlab-ci.yml b/gitlab-ci.yml index c3a2cf5fe7ac..08fc841e4c48 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -182,10 +182,6 @@ build-full:debian:12: BUILD_TYPE: debug CC: gcc-12 CXX: g++-12 - MESON_OPTIONS: >- - ${MESON_ALL_OPTIONS} - -D documentation=enabled - -D doc_werror=true - ARCH: amd64 BUILD_TYPE: release CC: gcc-12 @@ -232,6 +228,10 @@ 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++ @@ -248,11 +248,11 @@ build-history: extends: - .fdo.distribution-image@debian - .history-jobs - - .libcamera-ci.debian:12 + - .libcamera-ci.debian:13 - .libcamera-ci.scripts stage: build needs: - - job: container-debian:12 + - job: container-debian:13 artifacts: false script: - $CI_PROJECT_DIR/.gitlab-ci/build-libcamera-history.sh @@ -309,11 +309,11 @@ lint: extends: - .fdo.distribution-image@debian - .history-jobs - - .libcamera-ci.debian:12 + - .libcamera-ci.debian:13 - .libcamera-ci.scripts stage: lint needs: - - job: container-debian:12 + - job: container-debian:13 artifacts: false # checkstyle.py produces lots of false positives, its output is more # informational than normative. @@ -325,14 +325,14 @@ merge-check: extends: - .fdo.distribution-image@debian - .history-jobs - - .libcamera-ci.debian:12 + - .libcamera-ci.debian:13 - .libcamera-ci.scripts stage: lint # Patches may be pushed before they are fully tagged. Do not mark pre-review # development as a failure, but provide warnings on what is required. allow_failure: true needs: - - job: container-debian:12 + - job: container-debian:13 artifacts: false script: - $CI_PROJECT_DIR/.gitlab-ci/lint-pre-push.sh
Debian 13 being the current stable release, use it for the history build job and for the lint jobs, as well as for building documentation. For the lint jobs this brings the features of the latest version of the lint tools, while for the history build and documentation build it simply defaults to the latest stable distribution version. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- gitlab-ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)