From 7c455dfd932320910f389bf7342982f9c370b321 Mon Sep 17 00:00:00 2001
From: Sebastian Ramacher <sebastian@ramacher.at>
Date: Sun, 8 May 2022 14:50:48 +0200
Subject: [PATCH] CI: buster -> bullseye, add bookworm, bionic -> focal, eoan
 -> jammy

---
 .gitlab-ci.yml | 71 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35f409f..1b66767 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,12 +44,12 @@ test:archlinux:
   except:
     - tags
 
-# Debian 10 (Buster)
-build:debian-buster:
+# Debian 11 (bullseye)
+build:debian-bullseye:
   tags:
     - pwmt
   stage: build
-  image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:buster
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:bullseye
   script:
     - meson subprojects update
     - mkdir -p build && cd build
@@ -64,11 +64,11 @@ build:debian-buster:
   except:
     - tags
 
-test:debian-buster:
+test:debian-bullseye:
   tags:
     - pwmt
   stage: test
-  image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:buster
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:bullseye
   script:
     - cd build
     - ninja test
@@ -76,16 +76,52 @@ test:debian-buster:
     <<: *girara_cache
     policy: pull
   dependencies:
-    - build:debian-buster
+    - build:debian-bullseye
   except:
     - tags
 
-# Ubuntu 18.04 LTS (Bionic Beaver)
+# Debian 12 (bookworm)
+build:debian-bookworm:
+  tags:
+    - pwmt
+  stage: build
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:bookworm
+  script:
+    - meson subprojects update
+    - mkdir -p build && cd build
+    - meson --force-fallback-for=girara ..
+    - ninja
+  cache:
+    <<: *girara_cache
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - build
+  except:
+    - tags
+
+test:debian-bookworm:
+  tags:
+    - pwmt
+  stage: test
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:bookworm
+  script:
+    - cd build
+    - ninja test
+  cache:
+    <<: *girara_cache
+    policy: pull
+  dependencies:
+    - build:debian-bookworm
+  except:
+    - tags
+
+# Ubuntu 20.04 LTS (Focal)
 build:ubuntu-bionic:
   tags:
     - pwmt
   stage: build
-  image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:bionic
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:focal
   script:
     - meson subprojects update
     - mkdir -p build && cd build
@@ -100,11 +136,11 @@ build:ubuntu-bionic:
   except:
     - tags
 
-test:ubuntu-bionic:
+test:ubuntu-focal:
   tags:
     - pwmt
   stage: test
-  image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:bionic
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:focal
   script:
     - cd build
     - ninja test
@@ -112,16 +148,16 @@ test:ubuntu-bionic:
     <<: *girara_cache
     policy: pull
   dependencies:
-    - build:ubuntu-bionic
+    - build:ubuntu-focal
   except:
     - tags
 
-# Ubuntu 19.10 (Eoan Ermine)
-build:ubuntu-eoan:
+# Ubuntu 22.04 LTS (jammy)
+build:ubuntu-bionic:
   tags:
     - pwmt
   stage: build
-  image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:eoan
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:jammy
   script:
     - meson subprojects update
     - mkdir -p build && cd build
@@ -136,11 +172,11 @@ build:ubuntu-eoan:
   except:
     - tags
 
-test:ubuntu-eoan:
+test:ubuntu-jammy:
   tags:
     - pwmt
   stage: test
-  image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:eoan
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:jammy
   script:
     - cd build
     - ninja test
@@ -148,6 +184,7 @@ test:ubuntu-eoan:
     <<: *girara_cache
     policy: pull
   dependencies:
-    - build:ubuntu-eoan
+    - build:ubuntu-jammy
   except:
     - tags
+