From 483ae9fca47a424bcdbb75bfd63c90afd28b9ccc Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Thu, 11 May 2023 18:01:38 +0000
Subject: CI: Fallback on software-properties-common

---
 .github/prepare_debian.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index 5222659e..aa224ef9 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -5,13 +5,18 @@ set -e
 
 export DEBIAN_FRONTEND=noninteractive
 
-sed "s/main/non-free contrib/g" /etc/apt/sources.list.d/debian.sources > /etc/apt/sources.list.d/debian-nonfree.sources
-apt-get update
-apt-get -y install software-properties-common
-if [ $(lsb_release -is) = "Debian" ]; then
-  apt-add-repository non-free
-  apt-get update
+source /etc/os-release
+
+if [ ${ID} = "debian" ]; then
+	if [ -f /etc/apt/sources.list.d/debian.sources  ]; then
+		sed "s/main/non-free contrib/g" /etc/apt/sources.list.d/debian.sources > /etc/apt/sources.list.d/debian-nonfree.sources
+	else
+		apt-get update
+		apt-get -y install software-properties-common
+		apt-add-repository non-free
+	fi
 fi
+apt-get update
 apt-get -y install perl \
 	autotools-dev \
 	libdbi-dev \
-- 
cgit v1.2.3-74-g34f1


From 0918a6a30b204bd61e4b42c5731e18dc86a9e6c4 Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Thu, 11 May 2023 18:23:56 +0000
Subject: CI: Fallback on mysql service

---
 .github/prepare_debian.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index aa224ef9..7f5592b4 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -88,7 +88,7 @@ cp tools/squid.conf /etc/squid/squid.conf
 service squid start
 
 # mariadb
-service mariadb start
+service mariadb start || service mysql start
 mysql -e "create database IF NOT EXISTS test;" -uroot
 
 # ldap
-- 
cgit v1.2.3-74-g34f1


From 8cb3480b9bf24bf478c81745d49fbea779489872 Mon Sep 17 00:00:00 2001
From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com>
Date: Mon, 15 May 2023 20:17:48 +0200
Subject: Run tests on PRs again

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e825eb34..5685003c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - '*'
   pull_request:
+      - '*'
 
 jobs:
   codespell:
-- 
cgit v1.2.3-74-g34f1