Use proper Debian container instead of mixing Ubuntu with Debian repos
Some checks failed
Build ostree packages from sid to trixie / Build ostree packages (push) Failing after 4s

- Switch to debian:unstable container to avoid Ubuntu/Debian mixing issues
- Remove sudo commands since we're running as root in container
- This should resolve the GPG key verification problems
- Proper Debian environment for building Debian packages
- Much cleaner approach than trying to add Debian repos to Ubuntu
This commit is contained in:
robojerk 2025-09-06 11:31:20 -07:00
parent 61e89d04a7
commit 8352506f3b

View file

@ -10,6 +10,8 @@ jobs:
build: build:
name: Build ostree packages name: Build ostree packages
runs-on: ubuntu-latest runs-on: ubuntu-latest
container:
image: debian:unstable
permissions: permissions:
contents: read contents: read
packages: write packages: write
@ -33,23 +35,19 @@ jobs:
# Quick check with timeout to avoid hanging # Quick check with timeout to avoid hanging
if timeout 10 curl -s --connect-timeout 5 http://192.168.1.101:3142/acng-report.html > /dev/null 2>&1; then if timeout 10 curl -s --connect-timeout 5 http://192.168.1.101:3142/acng-report.html > /dev/null 2>&1; then
echo "✅ apt-cacher-ng is available, configuring proxy sources..." echo "✅ apt-cacher-ng is available, configuring proxy sources..."
echo "deb http://192.168.1.101:3142/ftp.debian.org/debian unstable main" | sudo tee /etc/apt/sources.list.d/debian-unstable.list echo "deb http://192.168.1.101:3142/ftp.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" | sudo tee -a /etc/apt/sources.list.d/debian-unstable.list echo "deb-src http://192.168.1.101:3142/ftp.us.debian.org/debian unstable main" >> /etc/apt/sources.list
else else
echo "⚠️ apt-cacher-ng not available, using standard Debian mirrors..." echo "⚠️ apt-cacher-ng not available, using standard Debian mirrors..."
echo "deb http://deb.debian.org/debian unstable main" | sudo tee /etc/apt/sources.list.d/debian-unstable.list echo "deb http://deb.debian.org/debian unstable main" > /etc/apt/sources.list
echo "deb-src http://deb.debian.org/debian unstable main" | sudo tee -a /etc/apt/sources.list.d/debian-unstable.list echo "deb-src http://deb.debian.org/debian unstable main" >> /etc/apt/sources.list
fi fi
# Add Debian keyring
sudo apt update
sudo apt install -y debian-archive-keyring
# Update package lists # Update package lists
sudo apt update -y apt update -y
# Install essential build tools # Install essential build tools
sudo apt install -y build-essential fakeroot devscripts curl git apt install -y build-essential fakeroot devscripts curl git
- name: Clone ostree from Debian sid - name: Clone ostree from Debian sid
run: | run: |
@ -65,9 +63,9 @@ jobs:
run: | run: |
echo "Installing build dependencies..." echo "Installing build dependencies..."
cd /tmp/ostree-* cd /tmp/ostree-*
sudo mk-build-deps -i -t 'apt-get -y' debian/control || echo "mk-build-deps failed, continuing..." mk-build-deps -i -t 'apt-get -y' debian/control || echo "mk-build-deps failed, continuing..."
sudo apt-get update apt-get update
sudo apt-get build-dep -y . || echo "Build deps installation failed, continuing..." apt-get build-dep -y . || echo "Build deps installation failed, continuing..."
- name: Add backport revision number - name: Add backport revision number
run: | run: |