From 3ca1c97b2d30443d0b54ab7b95032f79aa27cb22 Mon Sep 17 00:00:00 2001 From: robojerk Date: Sat, 6 Sep 2025 10:41:09 -0700 Subject: [PATCH] Fix CI workflow to use .sources format instead of sources.list - The CI was overriding the Dockerfile's fixed sources configuration - This was causing apt source ostree to fail silently - Now both apt-cacher-ng and standard mirrors use .sources format - This should finally allow the build to proceed to dpkg-buildpackage --- .forgejo/workflows/ci.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 1715604..7df39fa 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -75,12 +75,18 @@ jobs: if timeout 5 curl -s --connect-timeout 3 \ http://192.168.1.101:3142/acng-report.html > /dev/null 2>&1; then echo '✅ Using apt-cacher-ng for package downloads...' - echo 'deb http://192.168.1.101:3142/ftp.us.debian.org/debian unstable main' > /etc/apt/sources.list - echo 'deb-src http://192.168.1.101:3142/ftp.us.debian.org/debian unstable main' >> /etc/apt/sources.list + echo 'Types: deb deb-src' > /etc/apt/sources.list.d/debian.sources + echo 'URIs: http://192.168.1.101:3142/ftp.us.debian.org/debian' >> /etc/apt/sources.list.d/debian.sources + echo 'Suites: unstable' >> /etc/apt/sources.list.d/debian.sources + echo 'Components: main' >> /etc/apt/sources.list.d/debian.sources + echo 'Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg' >> /etc/apt/sources.list.d/debian.sources else echo '⚠️ Using standard Debian mirrors...' - echo 'deb http://deb.debian.org/debian unstable main' > /etc/apt/sources.list - echo 'deb-src http://deb.debian.org/debian unstable main' >> /etc/apt/sources.list + echo 'Types: deb deb-src' > /etc/apt/sources.list.d/debian.sources + echo 'URIs: http://deb.debian.org/debian' >> /etc/apt/sources.list.d/debian.sources + echo 'Suites: unstable' >> /etc/apt/sources.list.d/debian.sources + echo 'Components: main' >> /etc/apt/sources.list.d/debian.sources + echo 'Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg' >> /etc/apt/sources.list.d/debian.sources fi # Update package lists