From 84357741a6a6e6430f199b2c3f7498e0e97da9ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Sun, 12 Feb 2023 17:35:53 +0100
Subject: New upstream version 1.2.1

---
 .gitlab-ci.yml | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90df8f3..6334acb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ stages:
 # Debian GNU/Linux.
 
 make-dist:
-  image: $REGISTRY_HUB:debian-buster-mini
+  image: $REGISTRY_HUB:debian-bullseye-mini
   stage: tarball
   script:
   - git ls-files | xargs ./tools/style-check.sh
@@ -41,26 +41,26 @@ make-dist:
   - ./configure $CONFIGURE_OPTS
   - make -j2 -k $MAKE_FLAGS
 
-debian-9-full:
-  image: $REGISTRY_HUB:debian-stretch-full
+debian-10-full:
+  image: $REGISTRY_HUB:debian-buster-full
   variables:
     CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
     MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror"
   <<: *compile_definition
 
-debian-10-mini:
-  image: $REGISTRY_HUB:debian-buster-mini
+debian-11-mini:
+  image: $REGISTRY_HUB:debian-bullseye-mini
   variables:
     CONFIGURE_OPTS: "$CONFIGURE_MINI"
-    MAKE_FLAGS: "CFLAGS=-Werror"
+    MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror"
   <<: *compile_definition
 
 # In addition to the regular compile check, the full Debian stable
 # environment is used to keep some of the HTML documentation that's
 # available from our website up-to-date.
 
-debian-10-full:
-  image: $REGISTRY_HUB:debian-buster-full
+debian-11-full:
+  image: $REGISTRY_HUB:debian-bullseye-full
   variables:
     CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
     MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror"
@@ -76,20 +76,23 @@ debian-10-full:
     - doc/sanei-html
     expire_in: 1 day
 
-fedora-33-clang:
-  image: $REGISTRY_HUB:fedora-33-clang
+fedora-36-clang:
+  image: $REGISTRY_HUB:fedora-36-clang
   variables:
     CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
+    MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror"
   <<: *compile_definition
 
-alpine-3.13-musl:
-  image: $REGISTRY_HUB:alpine-3.13-musl
+alpine-3.15-musl:
+  image: $REGISTRY_HUB:alpine-3.15-musl
   variables:
     CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
+    MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror"
   <<: *compile_definition
+  allow_failure: true
 
-ubuntu-16.04-lts:
-  image: $REGISTRY_HUB:ubuntu-xenial-dist
+ubuntu-22.04-lts:
+  image: $REGISTRY_HUB:ubuntu-jammy-dist
   variables:
     CONFIGURE_OPTS: "$CONFIGURE_MINI $CONFIGURE_FULL"
     MAKE_FLAGS: "CFLAGS=-Werror CXXFLAGS=-Werror"
@@ -107,10 +110,10 @@ ubuntu-16.04-lts:
 # hence the dependency.
 
 make-distcheck:
-  image: $REGISTRY_HUB:debian-buster-full
+  image: $REGISTRY_HUB:debian-bullseye-full
   stage: snapshot
   dependencies:
-  - debian-10-full
+  - debian-11-full
   script:
   - tar xzf sane-backends-*.tar.gz --strip-components=1
   - rm sane-backends-*.tar.gz
-- 
cgit v1.2.3