From ec4b8afd44aa5c8d1692b408339f5e93568c59bc Mon Sep 17 00:00:00 2001
From: Sebastian Ramacher <sebastian@ramacher.at>
Date: Thu, 7 Sep 2023 18:47:35 +0200
Subject: [PATCH] CI: drop focal, bullseye, add trixie

---
 .gitlab-ci.yml | 48 ++++++------------------------------------------
 1 file changed, 6 insertions(+), 42 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 663678a..e7d258b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,42 +44,6 @@ test:archlinux:
   except:
     - tags
 
-# Debian 11 (bullseye)
-build:debian-bullseye:
-  tags:
-    - pwmt
-  stage: build
-  image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:bullseye
-  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-bullseye:
-  tags:
-    - pwmt
-  stage: test
-  image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:bullseye
-  script:
-    - cd build
-    - ninja test
-  cache:
-    <<: *girara_cache
-    policy: pull
-  dependencies:
-    - build:debian-bullseye
-  except:
-    - tags
-
 # Debian 12 (bookworm)
 build:debian-bookworm:
   tags:
@@ -116,12 +80,12 @@ test:debian-bookworm:
   except:
     - tags
 
-# Ubuntu 20.04 LTS (Focal)
-build:ubuntu-focal:
+# Debian 13 (trixie)
+build:debian-trixie:
   tags:
     - pwmt
   stage: build
-  image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:focal
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:trixie
   script:
     - meson subprojects update
     - mkdir -p build && cd build
@@ -136,11 +100,11 @@ build:ubuntu-focal:
   except:
     - tags
 
-test:ubuntu-focal:
+test:debian-trixie:
   tags:
     - pwmt
   stage: test
-  image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:focal
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:trixie
   script:
     - cd build
     - ninja test
@@ -148,7 +112,7 @@ test:ubuntu-focal:
     <<: *girara_cache
     policy: pull
   dependencies:
-    - build:ubuntu-focal
+    - build:debian-trixie
   except:
     - tags