From: Simon McVittie <smcv@collabora.com>
Date: Tue, 13 Sep 2022 15:15:16 +0000 (+0100)
Subject: CI: Use Debian 11 'bullseye' for most builds
X-Git-Tag: dbus-1.12.24~17^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b559b318f1965942545932505c90288f35d3e6be;p=thirdparty%2Fdbus.git

CI: Use Debian 11 'bullseye' for most builds

dbus 1.12.x was included in both Debian 10 'buster', which is now EOL,
and Debian 11 'bullseye', which continues to be supported. I need this
branch to work on Debian 11 for security and bugfix backports, but I'm
no longer supporting Debian 10.

Leave one build variant, the "legacy" build, on Debian 10 to check that
we can still build there, to be nice to the Debian LTS subproject.

Also continue to use Debian 10 for mingw builds, since dbus#380 has
not been fixed in this branch (which is now the security-fix-only
old-stable branch, so the fix will not be backported).

Signed-off-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd7c4c6b3..242e4fe6e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-image: debian:buster-slim
+image: debian:bullseye-slim
 
 stages:
   - build
@@ -45,11 +45,11 @@ variables:
   ci_parallel: "2"
   ci_sudo: "yes"
   ci_distro: "debian"
-  ci_suite: "buster"
+  ci_suite: "bullseye"
 
 production:
   stage: build
-  image: "debian:buster-slim"
+  image: "debian:bullseye-slim"
   variables:
     ci_variant: "production"
   script: &script
@@ -58,7 +58,7 @@ production:
 
 debug:
   stage: build
-  image: "debian:buster-slim"
+  image: "debian:bullseye-slim"
   variables:
     ci_variant: "debug"
   script: *script
@@ -66,14 +66,13 @@ debug:
 reduced:
   stage: build
   when: manual
-  image: "debian:buster-slim"
+  image: "debian:bullseye-slim"
   variables:
     ci_variant: "reduced"
   script: *script
 
 legacy:
   stage: build
-  when: manual
   image: "debian:buster-slim"
   variables:
     ci_variant: "legacy"
@@ -81,7 +80,7 @@ legacy:
 
 cmake:
   stage: build
-  image: "debian:buster-slim"
+  image: "debian:bullseye-slim"
   variables:
     ci_buildsys: "cmake-dist"
   script: *script