diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 61d8fbc..3ae0a16 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -59,9 +59,9 @@ jobs: git fetch --all git checkout ${{ github.sha || gitea.sha || 'main' }} - - name: Clone ostree from Debian sid + - name: Download and extract ostree source run: | - echo "Cloning ostree from Debian sid..." + echo "Downloading ostree source package..." cd /tmp apt source ostree || { echo "apt source ostree failed!"; exit 1; } cd ostree-* || { echo "Failed to change to ostree directory!"; exit 1; } @@ -71,37 +71,9 @@ jobs: - name: Install build dependencies run: | - echo "Installing build dependencies..." + echo "Installing build dependencies using apt build-dep..." cd /tmp/ostree-* - # 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 \ - zlib1g-dev \ - libbz2-dev \ - liblz4-dev + apt build-dep -y . || { echo "apt build-dep failed!"; exit 1; } - name: Add backport revision number run: | @@ -112,27 +84,16 @@ jobs: export EDITOR="nano" echo "y" | dch --bpo || echo "dch --bpo failed, continuing..." - - name: Test build - run: | - echo "Testing build with fakeroot debian/rules binary..." - cd /tmp/ostree-* - if fakeroot debian/rules binary; then - echo "Test build successful!" - else - echo "Test build failed!" - exit 1 - fi - - name: Build packages run: | - echo "Building ostree packages..." + echo "Building ostree packages using debuild..." cd /tmp/ostree-* echo "Current directory before build:" pwd ls -la - echo "Running dpkg-buildpackage..." - if dpkg-buildpackage --build=binary --unsigned-changes; then + echo "Running debuild -b -us -uc..." + if debuild -b -us -uc; then echo "Build successful!" else echo "Build failed! Checking for any partial packages..."