From f7b0c6c6d128dafb6dd0c5a77c79e31686b6f6ef Mon Sep 17 00:00:00 2001
From: robojerk <rraines@gmail.com>
Date: Sat, 6 Sep 2025 11:53:18 -0700
Subject: [PATCH] Fix build dependencies and dch issues

- Replace mk-build-deps and apt-get build-dep with specific package list
- Avoid installing full GNOME desktop and GUI packages
- Install only essential build dependencies for ostree
- Fix dch editor issues by setting environment variables and using echo y
- This should resolve the build failures and avoid unnecessary packages
---
 .forgejo/workflows/ci.yml | 77 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 71 insertions(+), 6 deletions(-)

diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml
index 21e6c69..af30928 100644
--- a/.forgejo/workflows/ci.yml
+++ b/.forgejo/workflows/ci.yml
@@ -21,6 +21,11 @@ jobs:
         run: |
           echo "Setting up Debian environment for building..."
           
+          # Install apt-cacher-ng requirements first
+          echo "Installing apt-cacher-ng requirements..."
+          apt update -y
+          apt install -y curl wget
+          
           # Try apt-cacher-ng first, fallback to Debian's automatic mirror selection
           echo "Checking for apt-cacher-ng availability..."
 
@@ -38,8 +43,13 @@ jobs:
           # Update package lists
           apt update -y
 
-          # Install essential tools first (including git)
-          apt install -y git curl build-essential fakeroot devscripts
+          # Install essential tools first (including git and editor)
+          apt install -y git curl build-essential fakeroot devscripts nano
+          
+          # Set environment variables for dch
+          export DEBEMAIL="build@particle-os.local"
+          export EMAIL="build@particle-os.local"
+          export EDITOR="nano"
 
       - name: Checkout code
         run: |
@@ -63,15 +73,70 @@ jobs:
         run: |
           echo "Installing build dependencies..."
           cd /tmp/ostree-*
-          mk-build-deps -i -t 'apt-get -y' debian/control || echo "mk-build-deps failed, continuing..."
-          apt-get update
-          apt-get build-dep -y . || echo "Build deps installation failed, continuing..."
+          # Install only essential build dependencies, avoid GUI packages
+          apt-get install -y \
+            libglib2.0-dev \
+            libfuse3-dev \
+            libsystemd-dev \
+            libgpgme-dev \
+            libarchive-dev \
+            libcurl4-openssl-dev \
+            libsoup2.4-dev \
+            libjson-glib-dev \
+            libyaml-dev \
+            libgirepository1.0-dev \
+            pkg-config \
+            meson \
+            ninja-build \
+            gtk-doc-tools \
+            libcap-dev \
+            libseccomp-dev \
+            libselinux1-dev \
+            libmount-dev \
+            libblkid-dev \
+            libkmod-dev \
+            libcryptsetup-dev \
+            liblzma-dev \
+            libzstd-dev \
+            libbrotli-dev \
+            libzlib-dev \
+            libbz2-dev \
+            liblz4-dev \
+            libxz-dev \
+            libgpgme-dev \
+            libarchive-dev \
+            libcurl4-openssl-dev \
+            libsoup2.4-dev \
+            libjson-glib-dev \
+            libyaml-dev \
+            libgirepository1.0-dev \
+            pkg-config \
+            meson \
+            ninja-build \
+            gtk-doc-tools \
+            libcap-dev \
+            libseccomp-dev \
+            libselinux1-dev \
+            libmount-dev \
+            libblkid-dev \
+            libkmod-dev \
+            libcryptsetup-dev \
+            liblzma-dev \
+            libzstd-dev \
+            libbrotli-dev \
+            libzlib-dev \
+            libbz2-dev \
+            liblz4-dev \
+            libxz-dev
 
       - name: Add backport revision number
         run: |
           echo "Adding backport revision number..."
           cd /tmp/ostree-*
-          dch --bpo || echo "dch --bpo failed, continuing..."
+          export DEBEMAIL="build@particle-os.local"
+          export EMAIL="build@particle-os.local"
+          export EDITOR="nano"
+          echo "y" | dch --bpo || echo "dch --bpo failed, continuing..."
 
       - name: Test build
         run: |