]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
CI: Upgrade from Debian 11 'bullseye' to Debian 12 'bookworm'
authorSimon McVittie <smcv@collabora.com>
Mon, 28 Oct 2024 16:57:21 +0000 (16:57 +0000)
committerSimon McVittie <smcv@collabora.com>
Mon, 28 Oct 2024 17:41:34 +0000 (17:41 +0000)
Debian 11 is EOL for normal security support, and doesn't ship dbus
1.14.x anyway. Do our acceptance testing in Debian 12, which is not EOL,
and does include dbus 1.14.x.

Drop the buster build altogether: it is EOL, even for Debian LTS.

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

index 43f4effd849b95e07c805b4496df1dcfa6b98aab..59390720f95911dd45ccd7b50c66f7979db83f5f 100644 (file)
@@ -25,7 +25,7 @@ workflow:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
     - if: $CI_PIPELINE_SOURCE == 'push' && $CI_PROJECT_NAMESPACE == 'dbus'
 
-image: debian:bullseye-slim
+image: debian:bookworm-slim
 
 stages:
   - 'build docker'
@@ -37,7 +37,7 @@ variables:
   ci_parallel: "2"
   ci_sudo: "yes"
   ci_distro: "debian"
-  ci_suite: "bullseye"
+  ci_suite: "bookworm"
   # Temporarily needed to clean up after dbus/dbus#447
   GIT_STRATEGY: clone
 
@@ -80,7 +80,6 @@ windows amd64 docker:
 
 .debian-build:
   stage: build
-  image: "debian:bullseye-slim"
   cache:
     key: ${CI_JOB_NAME}
     paths:
@@ -148,13 +147,6 @@ x86_64-w64-mingw32-cmake-debug:
     ci_host: "x86_64-w64-mingw32"
     ci_variant: "debug"
 
-buster:
-  extends: .debian-build
-  when: manual
-  image: "debian:buster-slim"
-  variables:
-    ci_suite: "buster"
-
 .win-build:
   image: $WINDOWS_IMAGE
   stage: build