particle-os/ostree
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unnecessary Docker container - use simple approach like composefs
Some checks failed
Build ostree packages from sid to trixie / Build ostree packages (push) Failing after 10s
Details

Browse source 
- Remove Docker-in-Docker complexity that was causing build script issues
- Use direct approach on Ubuntu runner with Debian repositories
- Follow the same pattern as the working composefs CI
- Much simpler and more reliable - no container networking issues
- Just add Debian repos to Ubuntu runner and build directly
This commit is contained in:
robojerk 2025-09-06 11:25:27 -07:00
parent a6b65be912
commit 71f1e86f84
1 changed files with 62 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

132
.forgejo/workflows/ci.yml
View file

@ -23,113 +23,95 @@ jobs:
git fetch --all
git checkout ${{ github.sha || gitea.sha || 'main' }}
- name: Build ostree packages in Docker
- name: Setup Debian environment
run: |
echo "Building ostree packages using Docker..."
echo "Setting up Debian environment for building..."
# Create a Dockerfile for the build environment
cat > /tmp/ostree/Dockerfile.build << 'EOF'
FROM debian:unstable
# Add Debian repositories
echo "Adding Debian unstable repositories..."
echo "deb http://deb.debian.org/debian unstable main" | sudo tee /etc/apt/sources.list.d/debian-unstable.list
echo "deb-src http://deb.debian.org/debian unstable main" | sudo tee -a /etc/apt/sources.list.d/debian-unstable.list
# Install build dependencies
RUN apt-get update && apt-get install -y \
build-essential \
fakeroot \
devscripts \
debian-keyring \
equivs \
curl \
git \
&& rm -rf /var/lib/apt/lists/*
# Add Debian sources
RUN 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
# Set working directory
WORKDIR /workspace
# Copy the CI script
COPY build-ostree.sh /workspace/
RUN chmod +x /workspace/build-ostree.sh
CMD ["/workspace/build-ostree.sh"]
EOF
# Create the build script
cat > /tmp/ostree/build-ostree.sh << 'EOF'
#!/bin/bash
set -e
echo "Starting ostree build process..."
# Add Debian keyring
sudo apt update
sudo apt install -y debian-archive-keyring
# Update package lists
apt-get update
sudo apt update -y
# Clone ostree from Debian sid
# Install essential build tools
sudo apt install -y build-essential fakeroot devscripts curl git
- name: Clone ostree from Debian sid
run: |
echo "Cloning ostree from Debian sid..."
apt source ostree
cd ostree-*
cd /tmp
apt source ostree || { echo "apt source ostree failed!"; exit 1; }
cd ostree-* || { echo "Failed to change to ostree directory!"; exit 1; }
echo "Changed to ostree directory:"
pwd
ls -la
# Install build dependencies
- name: Install build dependencies
run: |
echo "Installing build dependencies..."
mk-build-deps -i -t 'apt-get -y' debian/control
apt-get build-dep -y .
cd /tmp/ostree-*
sudo mk-build-deps -i -t 'apt-get -y' debian/control || echo "mk-build-deps failed, continuing..."
sudo apt-get update
sudo apt-get build-dep -y . || echo "Build deps installation failed, continuing..."
# Add backport revision number
- name: Add backport revision number
run: |
echo "Adding backport revision number..."
dch --bpo
cd /tmp/ostree-*
dch --bpo || echo "dch --bpo failed, continuing..."
# Test build
- name: Test build
run: |
echo "Testing build with fakeroot debian/rules binary..."
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
# Build packages
- name: Build packages
run: |
echo "Building ostree packages..."
dpkg-buildpackage --build=binary --unsigned-changes
cd /tmp/ostree-*
echo "Current directory before build:"
pwd
ls -la
echo "Running dpkg-buildpackage..."
if dpkg-buildpackage --build=binary --unsigned-changes; then
echo "Build successful!"
else
echo "Build failed! Checking for any partial packages..."
ls -la ../*.deb 2>/dev/null || echo "No .deb files found after failed build"
exit 1
fi
echo "Build completed! Checking for generated packages..."
ls -la ../*.deb
# Copy packages to workspace
cp ../*.deb /workspace/
cp ../*.dsc /workspace/ 2>/dev/null || true
cp ../*.tar.xz /workspace/ 2>/dev/null || true
echo "Packages copied to workspace:"
ls -la /workspace/
EOF
# Build and run the Docker container
cd /tmp/ostree
docker build -f Dockerfile.build -t ostree-builder .
# Run the build
docker run --rm -v /tmp/ostree:/workspace ostree-builder
# Check results
echo "Build completed. Checking for packages..."
ls -la /tmp/ostree/*.deb || echo "No .deb files found"
echo "Copying packages to workspace..."
cp ../*.deb /workspace/ 2>/dev/null || echo "No .deb files to copy"
- name: Upload to Forgejo Debian Registry
run: |
echo "Uploading to Forgejo Debian Registry..."
cd /tmp/ostree
cd /tmp/ostree-*
echo "Files in current directory:"
ls -la
echo "Looking for .deb files:"
ls -la *.deb 2>/dev/null || echo "No .deb files found"
echo "Searching for .deb files in all subdirectories:"
find . -name "*.deb" -type f
ls -la ../*.deb 2>/dev/null || echo "No .deb files found"
# Upload .deb files to Forgejo Debian Registry
for deb_file in *.deb; do
for deb_file in ../*.deb; do
if [ -f "$deb_file" ]; then
echo "Uploading $deb_file to Forgejo Debian Registry..."
curl --upload-file "$deb_file" \