Merge branch 'ci-update' into 'master'

CI: Bump Ubuntu, Fedora, Debian, and Alpine versions

See merge request sane-project/backends!813

.gitlab-ci.yml

@@ -5,7 +5,7 @@
 
 variables:
   REGISTRY_HUB: "registry.gitlab.com/sane-project/ci-envs"
-  CONFIGURE_MINI: "--enable-silent-rules"
+  CONFIGURE_MINI: ""
   CONFIGURE_FULL: "--with-usb --with-usb-record-replay --with-avahi --enable-pnm-backend --with-libcurl --with-poppler-glib"
 
 stages:
@@ -39,14 +39,7 @@ make-dist:
   - cd build
   - tar xzf ../sane-backends-*.tar.gz --strip-components=1
   - (set -x; ./configure $CONFIGURE_OPTS)
-  - eval "(set -x; make -j2 -k $MAKE_FLAGS)"
-
-debian-10-full:
-  image: $REGISTRY_HUB:debian-buster-full
-  variables:
-    CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
-    MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror"
-  <<: *compile_definition
+  - eval "(set -x; make -w -O -j2 -k $MAKE_FLAGS)"
 
 debian-11-mini:
   image: $REGISTRY_HUB:debian-bullseye-mini
@@ -59,8 +52,8 @@ debian-11-mini:
 # environment is used to keep some of the HTML documentation that's
 # available from our website up-to-date.
 
-debian-11-full:
-  image: $REGISTRY_HUB:debian-bullseye-full
+debian-12-full:
+  image: $REGISTRY_HUB:debian-bookworm-full
   variables:
     CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
     MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror"
@@ -76,22 +69,22 @@ debian-11-full:
     - doc/sanei-html
     expire_in: 1 day
 
-fedora-36-clang:
-  image: $REGISTRY_HUB:fedora-36-clang
+fedora-39-clang:
+  image: $REGISTRY_HUB:fedora-39-clang
   variables:
     CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
-    MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror"
+    MAKE_FLAGS: "CFLAGS='-Werror -Wno-error=unused-but-set-variable' CXXFLAGS='-Werror -Wno-error=unused-but-set-variable'"
   <<: *compile_definition
 
-alpine-3.15-musl:
-  image: $REGISTRY_HUB:alpine-3.15-musl
+alpine-3.18-musl:
+  image: $REGISTRY_HUB:alpine-3.18-musl
   variables:
     CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
     MAKE_FLAGS: "CFLAGS='-Werror -Wno-pedantic' CXXFLAGS=-Werror"
   <<: *compile_definition
 
-ubuntu-22.04-lts:
-  image: $REGISTRY_HUB:ubuntu-jammy-dist
+ubuntu-23.10:
+  image: $REGISTRY_HUB:ubuntu-mantic-dist
   variables:
     CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
     MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror"
@@ -112,7 +105,7 @@ make-distcheck:
   image: $REGISTRY_HUB:debian-bullseye-full
   stage: snapshot
   dependencies:
-  - debian-11-full
+  - debian-12-full
   script:
   - tar xzf sane-backends-*.tar.gz --strip-components=1
   - rm sane-backends-*.tar.gz

backend/kodakaio.c

@@ -1827,7 +1827,7 @@ k_init_parametersta(KodakAio_Scanner * s)
 	    SANE_UNFIX(s->val[OPT_BR_X].w), SANE_UNFIX(s->val[OPT_BR_Y].w));
 
 	/*
-	 * The default color depth is stored in mode_params.depth:‭
+	 * The default color depth is stored in mode_params.depth:
 	 */
 	if (mode_params[s->val[OPT_MODE].w].depth == 1)
 		s->params.depth = 1;