From 5d60c8576c487541edf88478871c8a1e4ec20b73 Mon Sep 17 00:00:00 2001
From: "Austin S. Hemmelgarn" <austin@netdata.cloud>
Date: Mon, 26 Oct 2020 08:56:12 -0400
Subject: Updated distros for CI checks and package builds. (#10123)

* Alpine 3.12 has been out for multiple months.
* Fedora 33 is slated for release on 2020-10-27, the current beta is
  functionally a release preview.
* Fedora 31 will be EOL as of 2020-11-27, any existing users should have
  updated by then.
* Ubuntu 20.10 is slated for release on 2020-10-22, the currently
  available system images are functionally a release preview.
* Ubuntu 19.10 went EOL on 2020-07-17.
* Our packaging code was missing a number of distros we technically
  support which we appear to build packages correctly for.
---
 .github/workflows/build-and-install.yml | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/build-and-install.yml b/.github/workflows/build-and-install.yml
index f8e749ee71..9af934a1e3 100644
--- a/.github/workflows/build-and-install.yml
+++ b/.github/workflows/build-and-install.yml
@@ -24,6 +24,7 @@ jobs:
       matrix:
         distro:
           - 'alpine:edge'
+          - 'alpine:3.12'
           - 'alpine:3.11'
           - 'alpine:3.10'
           - 'alpine:3.9'
@@ -31,23 +32,24 @@ jobs:
             #- 'centos:8'
           - 'centos:7'
           - 'clearlinux:latest'
-          - 'debian:bullseye'
-          - 'debian:buster'
-          - 'debian:stretch'
-          - 'debian:jessie'
+          - 'debian:10'
+          - 'debian:9'
+          - 'fedora:33'
           - 'fedora:32'
-          - 'fedora:31'
           - 'opensuse/leap:15.2'
           - 'opensuse/leap:15.1'
           - 'opensuse/tumbleweed:latest'
+          - 'ubuntu:20.10'
           - 'ubuntu:20.04'
-          - 'ubuntu:19.10'
           - 'ubuntu:18.04'
           - 'ubuntu:16.04'
         include:
           - distro: 'alpine:edge'
             pre: 'apk add -U bash'
             rmjsonc: 'apk del json-c-dev'
+          - distro: 'alpine:3.12'
+            pre: 'apk add -U bash'
+            rmjsonc: 'apk del json-c-dev'
           - distro: 'alpine:3.11'
             pre: 'apk add -U bash'
             rmjsonc: 'apk del json-c-dev'
@@ -64,19 +66,16 @@ jobs:
             #- distro: 'centos:8'
             #rmjsonc: 'dnf remove -y json-c-devel'
 
-          - distro: 'debian:bullseye'
-            pre: 'apt-get update'
-            rmjsonc: 'apt-get remove -y libjson-c-dev'
-          - distro: 'debian:buster'
+          - distro: 'debian:10'
             pre: 'apt-get update'
             rmjsonc: 'apt-get remove -y libjson-c-dev'
-          - distro: 'debian:stretch'
+          - distro: 'debian:9'
             pre: 'apt-get update'
             rmjsonc: 'apt-get remove -y libjson-c-dev'
 
-          - distro: 'fedora:32'
+          - distro: 'fedora:33'
             rmjsonc: 'dnf remove -y json-c-devel'
-          - distro: 'fedora:31'
+          - distro: 'fedora:32'
             rmjsonc: 'dnf remove -y json-c-devel'
 
           - distro: 'opensuse/leap:15.2'
@@ -86,10 +85,10 @@ jobs:
           - distro: 'opensuse/tumbleweed:latest'
             rmjsonc: 'zypper rm -y libjson-c-devel'
 
-          - distro: 'ubuntu:20.04'
+          - distro: 'ubuntu:20.10'
             pre: 'apt-get update'
             rmjsonc: 'apt-get remove -y libjson-c-dev'
-          - distro: 'ubuntu:19.10'
+          - distro: 'ubuntu:20.04'
             pre: 'apt-get update'
             rmjsonc: 'apt-get remove -y libjson-c-dev'
           - distro: 'ubuntu:18.04'
-- 
cgit v1.2.3