Fix CI workflow: Target Debian Trixie instead of Ubuntu Noble
Some checks failed
Test Build / Test bootc Build (with existing libostree) (push) Successful in 8m30s
Build bootc Package / Build bootc Package (push) Has been cancelled

- Change container from ubuntu:latest to debian:latest
- Update distribution target from noble to trixie
- Fix package version from 1~noble1 to 1~trixie1
- Update environment variable from UBUNTU_VERSION to DEBIAN_VERSION
- Remove hardcoded libostree dependency versions
- Update upload URLs to use trixie/main
- Fix build summary to show Debian version
- Ensure compatibility with Debian Trixie systems
This commit is contained in:
robojerk 2025-08-14 11:44:00 -07:00
parent 664f0c5338
commit 8280af22ed
2 changed files with 9 additions and 9 deletions

View file

@ -23,15 +23,15 @@ on:
workflow_dispatch: workflow_dispatch:
env: env:
UBUNTU_VERSION: "24.04" DEBIAN_VERSION: "trixie"
BOOTC_VERSION: "1.5.1" BOOTC_VERSION: "1.5.1"
jobs: jobs:
build-bootc: build-bootc:
name: Build bootc Package name: Build bootc Package
runs-on: ubuntu-latest runs-on: debian-latest
container: container:
image: ubuntu:latest image: debian:latest
steps: steps:
- name: Setup build environment - name: Setup build environment
shell: bash shell: bash
@ -56,12 +56,12 @@ jobs:
# Add Forgejo repository for libostree packages # Add Forgejo repository for libostree packages
echo "Adding Forgejo repository for libostree packages..." echo "Adding Forgejo repository for libostree packages..."
curl -fsSL https://git.raines.xyz/api/packages/robojerk/debian/repository.key | gpg --dearmor -o /usr/share/keyrings/forgejo-robojerk.gpg curl -fsSL https://git.raines.xyz/api/packages/robojerk/debian/repository.key | gpg --dearmor -o /usr/share/keyrings/forgejo-robojerk.gpg
echo "deb [signed-by=/usr/share/keyrings/forgejo-robojerk.gpg] https://git.raines.xyz/api/packages/robojerk/debian noble main" | tee /etc/apt/sources.list.d/forgejo-robojerk.list echo "deb [signed-by=/usr/share/keyrings/forgejo-robojerk.gpg] https://git.raines.xyz/api/packages/robojerk/debian trixie main" | tee /etc/apt/sources.list.d/forgejo-robojerk.list
# Update package lists and install libostree packages # Update package lists and install libostree packages
apt update -y apt update -y
echo "Installing libostree packages from Forgejo repository..." echo "Installing libostree packages from Forgejo repository..."
apt install -y libostree-dev=2025.2-1~noble1 libostree-1-1=2025.2-1~noble1 apt install -y libostree-dev libostree-1-1
echo "✅ libostree packages installed successfully" echo "✅ libostree packages installed successfully"
echo "libostree-dev version: $(dpkg-query -W -f='${Version}' libostree-dev)" echo "libostree-dev version: $(dpkg-query -W -f='${Version}' libostree-dev)"
@ -236,7 +236,7 @@ jobs:
http_code=$(curl -s -o /dev/null -w "%{http_code}" \ http_code=$(curl -s -o /dev/null -w "%{http_code}" \
--user "robojerk:${{ secrets.ACCESS_TOKEN }}" \ --user "robojerk:${{ secrets.ACCESS_TOKEN }}" \
--upload-file "$deb_file" \ --upload-file "$deb_file" \
"https://git.raines.xyz/api/packages/robojerk/debian/pool/noble/main/upload") "https://git.raines.xyz/api/packages/robojerk/debian/pool/trixie/main/upload")
echo "HTTP Response Code: $http_code" echo "HTTP Response Code: $http_code"
@ -249,7 +249,7 @@ jobs:
# Show verbose output for debugging failures # Show verbose output for debugging failures
curl -v -i --user "robojerk:${{ secrets.ACCESS_TOKEN }}" \ curl -v -i --user "robojerk:${{ secrets.ACCESS_TOKEN }}" \
--upload-file "$deb_file" \ --upload-file "$deb_file" \
"https://git.raines.xyz/api/packages/robojerk/debian/pool/noble/main/upload" 2>&1 "https://git.raines.xyz/api/packages/robojerk/debian/pool/trixie/main/upload" 2>&1
exit 1 exit 1
fi fi
fi fi
@ -264,7 +264,7 @@ jobs:
echo "Bootc Package Build Summary" > release-assets/BUILD_SUMMARY.txt echo "Bootc Package Build Summary" > release-assets/BUILD_SUMMARY.txt
echo "===========================" >> release-assets/BUILD_SUMMARY.txt echo "===========================" >> release-assets/BUILD_SUMMARY.txt
echo "Build Date: $(date)" >> release-assets/BUILD_SUMMARY.txt echo "Build Date: $(date)" >> release-assets/BUILD_SUMMARY.txt
echo "Ubuntu Version: ${UBUNTU_VERSION}" >> release-assets/BUILD_SUMMARY.txt echo "Debian Version: ${DEBIAN_VERSION}" >> release-assets/BUILD_SUMMARY.txt
echo "Bootc Version: ${BOOTC_VERSION}" >> release-assets/BUILD_SUMMARY.txt echo "Bootc Version: ${BOOTC_VERSION}" >> release-assets/BUILD_SUMMARY.txt
echo "" >> release-assets/BUILD_SUMMARY.txt echo "" >> release-assets/BUILD_SUMMARY.txt
echo "Built Packages:" >> release-assets/BUILD_SUMMARY.txt echo "Built Packages:" >> release-assets/BUILD_SUMMARY.txt

View file

@ -7,7 +7,7 @@ set -e
# Configuration # Configuration
BOOTC_VERSION="1.5.1" BOOTC_VERSION="1.5.1"
PACKAGE_VERSION="${BOOTC_VERSION}-1~noble1" PACKAGE_VERSION="${BOOTC_VERSION}-1~trixie1"
BOOTC_REPO="https://github.com/containers/bootc.git" BOOTC_REPO="https://github.com/containers/bootc.git"
BUILD_DIR="/tmp/bootc-deb-build" BUILD_DIR="/tmp/bootc-deb-build"
PATCH_FILE="bootc-libostree-compatibility.patch" PATCH_FILE="bootc-libostree-compatibility.patch"