.github/workflows/: Rename container images.

* bookworm_amd64 → debian12
* bullseye_amd64 → debian11
* buster_amd64 → debian10
* mantic_amd64 → ubuntu23.10
* jammy_amd64 → ubuntu22.04
* focal_amd64 → ubuntu20.04
* el9_x86_64 → centos9
* fedora38_x86_64 -> fedora38
* fedora_rawhide_x86_64 → fedora_main

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7fa743cce61641691ac1978e718ce669e842f421..77fa197e81e721bf5a3aa9995dd3f7aca341a599 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,22 +23,22 @@ jobs:
       matrix:
         container_tag:
           # debian family
-          - bookworm_amd64
-          - bullseye_amd64
-          - buster_amd64
+          - debian12
+          - debian11
+          - debian10
           # Ubuntu
-          - mantic_amd64
-          - jammy_amd64
-          - focal_amd64
+          - ubuntu23.10
+          - ubuntu22.04
+          - ubuntu20.04
           # RedHat family
-          - el9_x86_64
+          - centos9
           - fedora39
-          - fedora38_x86_64
+          - fedora38
         configure_flags: ['']
         include:
-          - container_tag: bookworm_amd64
+          - container_tag: debian12
             configure_flags: '--enable-debug'
-          - container_tag: bookworm_amd64
+          - container_tag: debian12
             # By default clang emits DWARF v5, which Valgrind cannot read yet.
             # https://github.com/llvm/llvm-project/issues/56550
             configure_flags: 'CC=clang CXX=clang++ CFLAGS=-gdwarf-4'
@@ -77,7 +77,7 @@ jobs:
       run: exit $(< make-check.status)
 
   experimental:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     container: collectd/ci:${{ matrix.container_tag }}
     continue-on-error: true
     strategy:
@@ -86,12 +86,12 @@ jobs:
         # for tasks that are optional, use the continue-on-error option, to prevent a workflow from failing when the task fails
         container_tag:
           - debian_unstable
-          - fedora_rawhide_x86_64
+          - fedora_main
         # Add additional per-distro vars here.
         include:
           - container_tag: debian_unstable
             configure_flags: "--disable-dpdkstat --disable-dpdkevents --disable-virt"
-          - container_tag: fedora_rawhide_x86_64
+          - container_tag: fedora_main
             cflags: "-fPIE -Wno-deprecated-declarations"
             cppflags: "-fPIE -Wno-deprecated-declarations"
             configure_flags: "--disable-dpdkstat --disable-dpdkevents --disable-virt --disable-xmms"

diff --git a/.github/workflows/distcheck.yml b/.github/workflows/distcheck.yml
index 9898b4e5d1b742a7df9fdb19f64530cb450d6cf0..738a26ea50b7524dd07c7571920d3e5b70a8ff4e 100644 (file)
--- a/.github/workflows/distcheck.yml
+++ b/.github/workflows/distcheck.yml
@@ -16,7 +16,7 @@ defaults:
 jobs:
   make_distcheck:
     runs-on: ubuntu-latest
-    container: collectd/ci:bullseye_amd64
+    container: collectd/ci:debian11
     env:
       # this env var picked up by valgrind during make check phase
       VALGRIND_OPTS: "--errors-for-leak-kinds=definite"