CI: remove ubuntu 18.04, debian stretch, centos 7; add ubuntu 22.04, …

…debian bookworm
CESNET · Jan 11, 2024 · ef22897 · ef22897
1 parent ac2dace
commit ef22897
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,12 +9,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'
@@ -56,10 +55,7 @@ jobs:
     - name: Build the project
       run: |
         mkdir build && cd build
-        cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=$TESTS
+        cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=1
         make && make install
-      env:
-        TESTS: ${{ startsWith(matrix.image, 'centos:7') != true }}
     - name: Run tests
-      if: startsWith(matrix.image, 'centos:7') != true
       run: cd build && make test
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -9,7 +9,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 }}
@@ -59,7 +59,6 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - 'centos:7'
           - 'quay.io/centos/centos:stream8'
           - 'oraclelinux:8'
           - 'oraclelinux:9'