diff --git a/.forgejo/workflows/build-packages.yml b/.forgejo/workflows/build-packages.yml index dd2a201..fd76398 100644 --- a/.forgejo/workflows/build-packages.yml +++ b/.forgejo/workflows/build-packages.yml @@ -23,15 +23,15 @@ on: workflow_dispatch: env: - UBUNTU_VERSION: "24.04" + DEBIAN_VERSION: "trixie" BOOTC_VERSION: "1.5.1" jobs: build-bootc: name: Build bootc Package - runs-on: ubuntu-latest + runs-on: debian-latest container: - image: ubuntu:latest + image: debian:latest steps: - name: Setup build environment shell: bash @@ -56,12 +56,12 @@ jobs: # Add 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 - 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 apt update -y 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-dev version: $(dpkg-query -W -f='${Version}' libostree-dev)" @@ -236,7 +236,7 @@ jobs: http_code=$(curl -s -o /dev/null -w "%{http_code}" \ --user "robojerk:${{ secrets.ACCESS_TOKEN }}" \ --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" @@ -249,7 +249,7 @@ jobs: # Show verbose output for debugging failures curl -v -i --user "robojerk:${{ secrets.ACCESS_TOKEN }}" \ --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 fi fi @@ -264,7 +264,7 @@ jobs: echo "Bootc Package Build Summary" > release-assets/BUILD_SUMMARY.txt echo "===========================" >> 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 "" >> release-assets/BUILD_SUMMARY.txt echo "Built Packages:" >> release-assets/BUILD_SUMMARY.txt diff --git a/build.sh b/build.sh index f7a1fc0..d595ff7 100755 --- a/build.sh +++ b/build.sh @@ -7,7 +7,7 @@ set -e # Configuration 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" BUILD_DIR="/tmp/bootc-deb-build" PATCH_FILE="bootc-libostree-compatibility.patch"