From a2d7dede737947d7c6afa20a88e1f0c64e0eb96c Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 10 Aug 2023 11:18:52 +0200
Subject: Merging upstream version 1.42.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .github/data/distros.yml | 109 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 93 insertions(+), 16 deletions(-)

(limited to '.github/data/distros.yml')

diff --git a/.github/data/distros.yml b/.github/data/distros.yml
index 8376b1f03..827378502 100644
--- a/.github/data/distros.yml
+++ b/.github/data/distros.yml
@@ -20,6 +20,8 @@ include:
   - &alpine
     distro: alpine
     version: edge
+    support_type: Community
+    notes: ''
     eol_check: false
     env_prep: |
       apk add -U bash
@@ -27,18 +29,31 @@ include:
       apk del json-c-dev
     test:
       ebpf-core: true
+  - <<: *alpine
+    version: "3.18"
+    support_type: Core
+    notes: ''
+    eol_check: true
   - <<: *alpine
     version: "3.17"
+    support_type: Intermediate
+    notes: ''
     eol_check: true
   - <<: *alpine
     version: "3.16"
+    support_type: Intermediate
+    notes: ''
     eol_check: true
   - <<: *alpine
     version: "3.15"
+    support_type: Intermediate
+    notes: ''
     eol_check: true
 
   - distro: archlinux
     version: latest
+    support_type: Intermediate
+    notes: ''
     eol_check: false
     env_prep: |
       pacman --noconfirm -Syu && pacman --noconfirm -Sy grep libffi
@@ -48,6 +63,8 @@ include:
   - &alma
     distro: almalinux
     version: "9"
+    support_type: Core
+    notes: ''
     jsonc_removal: |
       dnf remove -y json-c-devel
     eol_check: true
@@ -74,6 +91,8 @@ include:
   - &amzn
     distro: amazonlinux
     version: "2"
+    support_type: Core
+    notes: ''
     eol_check: 'amazon-linux'
     packages: &amzn_packages
       type: rpm
@@ -92,6 +111,8 @@ include:
 
   - distro: centos
     version: "7"
+    support_type: Core
+    notes: ''
     eol_check: false
     packages:
       type: rpm
@@ -107,6 +128,8 @@ include:
   - &debian
     distro: debian
     version: "12"
+    support_type: Core
+    notes: ''
     base_image: debian:bookworm
     eol_check: true
     env_prep: |
@@ -143,6 +166,8 @@ include:
   - &fedora
     distro: fedora
     version: "38"
+    support_type: Core
+    notes: ''
     eol_check: true
     jsonc_removal: |
       dnf remove -y json-c-devel
@@ -164,27 +189,25 @@ include:
 
   - &opensuse
     distro: opensuse
-    version: "tumbleweed"
+    version: "15.5"
+    support_type: Core
+    notes: ''
     eol_check: true
-    base_image: opensuse/tumbleweed
+    base_image: opensuse/leap:15.5
     jsonc_removal: |
       zypper rm -y libjson-c-devel
     packages: &opensuse_packages
       type: rpm
-      repo_distro: opensuse/tumbleweed
+      repo_distro: opensuse/leap:15.4
       arches:
         - x86_64
         - aarch64
     test:
       ebpf-core: true
-  - <<: *opensuse
-    version: "15.5"
-    base_image: opensuse/leap:15.5
-    packages:
-      <<: *opensuse_packages
-      repo_distro: opensuse/15.5
   - <<: *opensuse
     version: "15.4"
+    support_type: Core
+    notes: ''
     base_image: opensuse/leap:15.4
     packages:
       <<: *opensuse_packages
@@ -193,6 +216,8 @@ include:
   - &oracle
     distro: oraclelinux
     version: "8"
+    support_type: Core
+    notes: ''
     eol_check: true
     jsonc_removal: |
       dnf remove -y json-c-devel
@@ -212,7 +237,9 @@ include:
 
   - &ubuntu
     distro: ubuntu
-    version: "22.10"
+    version: "22.04"
+    support_type: Core
+    notes: ''
     eol_check: true
     env_prep: |
       rm -f /etc/apt/apt.conf.d/docker && apt-get update
@@ -220,7 +247,7 @@ include:
       apt-get remove -y libjson-c-dev
     packages: &ubuntu_packages
       type: deb
-      repo_distro: ubuntu/kinetic
+      repo_distro: ubuntu/jammy
       arches:
         - amd64
         - armhf
@@ -232,13 +259,63 @@ include:
     packages:
       <<: *ubuntu_packages
       repo_distro: ubuntu/lunar
-  - <<: *ubuntu
-    version: "22.04"
-    packages:
-      <<: *ubuntu_packages
-      repo_distro: ubuntu/jammy
   - <<: *ubuntu
     version: "20.04"
     packages:
       <<: *ubuntu_packages
       repo_distro: ubuntu/focal
+no_include: # Info for platforms not covered in CI
+  - distro: docker
+    version: "19.03 or newer"
+    support_type: Core
+    notes: ''
+    packages:
+      arches:
+        - linux/i386
+        - linux/amd64
+        - linux/arm/v7
+        - linux/arm64
+        - linux/ppc64le
+
+  - distro: clearlinux
+    version: latest
+    support_type: Community
+    notes: ''
+
+  - &rhel
+    distro: rhel
+    version: "9.x"
+    support_type: Core
+    notes: ''
+    packages:
+      arches:
+        - x86_64
+        - aarch64
+  - <<: *rhel
+    version: "8.x"
+  - <<: *rhel
+    version: "7.x"
+    packages:
+      arches:
+        - x86_64
+
+  - &freebsd
+    distro: freebsd
+    version: 13-STABLE
+    support_type: Community
+    notes: ''
+
+  - &macos
+    distro: macos
+    version: '13'
+    support_type: Community
+    notes: ''
+  - <<: *macos
+    version: '12'
+  - <<: *macos
+    version: '11'
+
+  - distro: gentoo
+    version: latest
+    support_type: Community
+    notes: ''
-- 
cgit v1.2.3