From ba24c979d1c757657cdd06251f9e44228e7e4d06 Mon Sep 17 00:00:00 2001
From: Michal Sedlak <xsedla0v@stud.fit.vutbr.cz>
Date: Sun, 7 Jan 2024 01:00:18 +0100
Subject: [PATCH] ci: remove ubuntu 18.04, debian stretch, centos 7; add ubuntu
 22.04, debian bookworm

---
 .github/workflows/main.yml     | 6 ++----
 .github/workflows/packages.yml | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9d078e34..4c6192dc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,12 +16,11 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - 'ubuntu:18.04'
           - 'ubuntu:20.04'
-          - 'debian:stretch'
+          - 'ubuntu:22.04'
           - 'debian:buster'
           - 'debian:bullseye'
-          - 'centos:7'
+          - 'debian:bookworm'
           - 'quay.io/centos/centos:stream8'
           - 'oraclelinux:8'
           - 'oraclelinux:9'
@@ -101,7 +100,6 @@ jobs:
       env:
         TESTS: ${{ startsWith(matrix.image, 'centos:7') != true }}
     - name: Run tests
-      if: startsWith(matrix.image, 'centos:7') != true
       run: cd build && make test
     - name: Try to run IPFIXcol2
       run: |
diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
index 6c678f13..53dceebf 100644
--- a/.github/workflows/packages.yml
+++ b/.github/workflows/packages.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image: ['ubuntu:18.04', 'ubuntu:20.04', 'debian:stretch', 'debian:buster', 'debian:bullseye']
+        image: ['ubuntu:20.04', 'ubuntu:22.04', 'debian:buster', 'debian:bullseye', 'debian:bookworm']
 
     name: Build DEBs on ${{ matrix.image }}
     container: ${{ matrix.image }}
@@ -91,7 +91,6 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - 'centos:7'
           - 'quay.io/centos/centos:stream8'
           - 'oraclelinux:8'
           - 'oraclelinux:9'