From d0c44810a4ce72d91e3192dde215d9e2ac449a26 Mon Sep 17 00:00:00 2001
From: Julian Brost <julian.brost@icinga.com>
Date: Mon, 25 Jul 2022 13:00:42 +0200
Subject: [PATCH 1/2] GitHub Actions: Build Raspbian on Ubuntu 22.04

Raspbian builds were running on Ubuntu 20.04 but with qemu-user-static from Ubuntu 21.10 (impish) due to need for newer features. However, the impish package repos are no longer available as that version reached its EOL. ubuntu-latest still refers to 20.04 on GitHub Actions but 22.04 is already available when explicitly specified. This commit switches the build over to that version and removes the workaround.
---
 .github/workflows/raspbian.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/raspbian.yml b/.github/workflows/raspbian.yml
index f7115e585..479460543 100644
--- a/.github/workflows/raspbian.yml
+++ b/.github/workflows/raspbian.yml
@@ -18,7 +18,7 @@ jobs:
           - buster
           - bullseye
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04 # revert back to ubuntu-latest once that is 22.04 or later
 
     steps:
       - name: Cancel previous jobs for the same PR
@@ -34,10 +34,6 @@ jobs:
       - name: qemu-user-static
         run: |
           set -exo pipefail
-          . /etc/os-release
-          if [ "$VERSION_ID" = 20.04 ]; then
-            sudo perl -pi -e s/focal/impish/g /etc/apt/sources.list
-          fi
           sudo apt-get update
           DEBIAN_FRONTEND=noninteractive sudo apt-get install -y qemu-user-static
 

From 19dd611e659e8378d75b72e5d910e824c63a71dd Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Mon, 25 Jul 2022 16:55:34 +0200
Subject: [PATCH 2/2] GHA: Update build targets

---
 .github/workflows/deb.yml | 9 ---------
 .github/workflows/rpm.yml | 9 ++++++---
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/deb.yml b/.github/workflows/deb.yml
index fc65f136e..f77bc3595 100644
--- a/.github/workflows/deb.yml
+++ b/.github/workflows/deb.yml
@@ -21,21 +21,12 @@ jobs:
           - name: debian
             codename: buster
             has32bit: true
-          - name: debian
-            codename: stretch
-            has32bit: true
           - name: ubuntu
             codename: jammy
             has32bit: false
-          - name: ubuntu
-            codename: impish
-            has32bit: false
           - name: ubuntu
             codename: focal
             has32bit: false
-          - name: ubuntu
-            codename: bionic
-            has32bit: true
 
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/rpm.yml b/.github/workflows/rpm.yml
index 003c805e5..d3be4063c 100644
--- a/.github/workflows/rpm.yml
+++ b/.github/workflows/rpm.yml
@@ -33,15 +33,18 @@ jobs:
           - name: fedora
             release: 35
             subscription: false
-          - name: fedora
-            release: 34
-            subscription: false
+          - name: sles
+            release: '15.4'
+            subscription: true
           - name: sles
             release: '15.3'
             subscription: true
           - name: sles
             release: '12.5'
             subscription: true
+          - name: opensuse
+            release: '15.4'
+            subscription: false
           - name: opensuse
             release: '15.3'
             subscription: false