From 6a98787cfa6ffd45f4610e1a4bcc807b8a13260a Mon Sep 17 00:00:00 2001
From: Graham McIntire <graham@mcintire.me>
Date: Fri, 1 May 2026 13:16:50 -0500
Subject: [PATCH] ci: enable Debian non-free in deb822 sources for
 snmp-mibs-downloader
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bookworm runner images use /etc/apt/sources.list.d/*.sources (deb822),
which the legacy sed didn't touch — non-free stayed off and
snmp-mibs-downloader was unavailable. Patch the Components: line in
deb822 sources too.
---
 .forgejo/workflows/e2e-tests.yaml  | 10 ++++++++--
 .forgejo/workflows/pr-tests.yaml   | 10 ++++++++--
 .forgejo/workflows/production.yaml | 10 ++++++++--
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/.forgejo/workflows/e2e-tests.yaml b/.forgejo/workflows/e2e-tests.yaml
index 5caf7f93..ba66420b 100644
--- a/.forgejo/workflows/e2e-tests.yaml
+++ b/.forgejo/workflows/e2e-tests.yaml
@@ -90,8 +90,14 @@ jobs:
       - name: Install system dependencies
         run: |
           . /etc/os-release
-          if [ "$ID" = "debian" ] && [ -f /etc/apt/sources.list ]; then
-            sed -i 's/ main$/ main contrib non-free non-free-firmware/' /etc/apt/sources.list
+          if [ "$ID" = "debian" ]; then
+            if [ -f /etc/apt/sources.list ] && grep -q "^deb " /etc/apt/sources.list; then
+              sed -i 's/ main$/ main contrib non-free non-free-firmware/' /etc/apt/sources.list
+            fi
+            for f in /etc/apt/sources.list.d/*.sources; do
+              [ -f "$f" ] || continue
+              sed -i 's/^Components: main$/Components: main contrib non-free non-free-firmware/' "$f"
+            done
           fi
           apt-get update
           apt-get install -y libssl-dev libsnmp-dev snmp-mibs-downloader postgresql-client
diff --git a/.forgejo/workflows/pr-tests.yaml b/.forgejo/workflows/pr-tests.yaml
index f1be9af6..60a36512 100644
--- a/.forgejo/workflows/pr-tests.yaml
+++ b/.forgejo/workflows/pr-tests.yaml
@@ -71,8 +71,14 @@ jobs:
       - name: Install system dependencies
         run: |
           . /etc/os-release
-          if [ "$ID" = "debian" ] && [ -f /etc/apt/sources.list ]; then
-            sed -i 's/ main$/ main contrib non-free non-free-firmware/' /etc/apt/sources.list
+          if [ "$ID" = "debian" ]; then
+            if [ -f /etc/apt/sources.list ] && grep -q "^deb " /etc/apt/sources.list; then
+              sed -i 's/ main$/ main contrib non-free non-free-firmware/' /etc/apt/sources.list
+            fi
+            for f in /etc/apt/sources.list.d/*.sources; do
+              [ -f "$f" ] || continue
+              sed -i 's/^Components: main$/Components: main contrib non-free non-free-firmware/' "$f"
+            done
           fi
           apt-get update
           apt-get install -y libssl-dev libsnmp-dev snmp-mibs-downloader postgresql-client
diff --git a/.forgejo/workflows/production.yaml b/.forgejo/workflows/production.yaml
index bbb5ee58..8a043ad2 100644
--- a/.forgejo/workflows/production.yaml
+++ b/.forgejo/workflows/production.yaml
@@ -65,8 +65,14 @@ jobs:
       - name: Install system dependencies
         run: |
           . /etc/os-release
-          if [ "$ID" = "debian" ] && [ -f /etc/apt/sources.list ]; then
-            sed -i 's/ main$/ main contrib non-free non-free-firmware/' /etc/apt/sources.list
+          if [ "$ID" = "debian" ]; then
+            if [ -f /etc/apt/sources.list ] && grep -q "^deb " /etc/apt/sources.list; then
+              sed -i 's/ main$/ main contrib non-free non-free-firmware/' /etc/apt/sources.list
+            fi
+            for f in /etc/apt/sources.list.d/*.sources; do
+              [ -f "$f" ] || continue
+              sed -i 's/^Components: main$/Components: main contrib non-free non-free-firmware/' "$f"
+            done
           fi
           apt-get update
           apt-get install -y libssl-dev libsnmp-dev snmp-mibs-downloader postgresql-client