From 546752e557f6ac630aa6d0b54f5ad82c0745d690 Mon Sep 17 00:00:00 2001 From: robojerk Date: Tue, 9 Sep 2025 18:20:12 -0700 Subject: [PATCH] Fix CI workflow repository references and YAML syntax --- .forgejo/workflows/ci.yml | 56 +++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index a336c2b..41f047d 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -87,9 +87,9 @@ jobs: - name: Checkout code run: | # Clone the repository manually - git clone https://git.raines.xyz/particle-os/bootc-image-builder.git /tmp/bootc-image-builder - cp -r /tmp/bootc-image-builder/* . - cp -r /tmp/bootc-image-builder/.* . 2>/dev/null || true + git clone https://git.raines.xyz/particle-os/apt-ostree-builder.git /tmp/apt-ostree-builder + cp -r /tmp/apt-ostree-builder/* . + cp -r /tmp/apt-ostree-builder/.* . 2>/dev/null || true - name: Verify Rust toolchain run: | @@ -147,16 +147,16 @@ jobs: echo "Commit Hash: $SHORT_COMMIT" # Create simple Debian package structure - mkdir -p debian/bootc-image-builder/usr/bin - mkdir -p debian/bootc-image-builder/DEBIAN + mkdir -p debian/apt-ostree-builder/usr/bin + mkdir -p debian/apt-ostree-builder/DEBIAN # Copy binary - cp target/release/bootc-image-builder debian/bootc-image-builder/usr/bin/ - chmod +x debian/bootc-image-builder/usr/bin/bootc-image-builder + cp target/release/apt-ostree-builder debian/apt-ostree-builder/usr/bin/ + chmod +x debian/apt-ostree-builder/usr/bin/apt-ostree-builder # Create control file { - echo "Package: bootc-image-builder" + echo "Package: apt-ostree-builder" echo "Version: $BUILD_VERSION" echo "Section: admin" echo "Priority: optional" @@ -181,12 +181,12 @@ jobs: echo " - UEFI and BIOS boot modes" echo " - Secure boot support" echo " - Cloud integration (AWS, Azure, GCP)" - } > debian/bootc-image-builder/DEBIAN/control + } > debian/apt-ostree-builder/DEBIAN/control # Build package - dpkg-deb --build debian/bootc-image-builder "bootc-image-builder_${BUILD_VERSION}_amd64.deb" + dpkg-deb --build debian/apt-ostree-builder "apt-ostree-builder_${BUILD_VERSION}_amd64.deb" - echo "✅ Debian package created: bootc-image-builder_${BUILD_VERSION}_amd64.deb" + echo "✅ Debian package created: apt-ostree-builder_${BUILD_VERSION}_amd64.deb" ls -la *.deb - name: Test built package @@ -203,13 +203,13 @@ jobs: dpkg -i "$DEB_PACKAGE" || echo "Installation test failed (this is normal for CI)" # Check if binary is accessible - if which bootc-image-builder >/dev/null 2>&1; then - echo "✅ bootc-image-builder installed successfully" - bootc-image-builder --version || echo "Version check failed" + if which apt-ostree-builder >/dev/null 2>&1; then + echo "✅ apt-ostree-builder installed successfully" + apt-ostree-builder --version || echo "Version check failed" else - echo "❌ bootc-image-builder not found in PATH" + echo "❌ apt-ostree-builder not found in PATH" echo "Checking installation location:" - find /usr -name "bootc-image-builder" 2>/dev/null || echo "Not found in /usr" + find /usr -name "apt-ostree-builder" 2>/dev/null || echo "Not found in /usr" fi else echo "❌ No main package found to test" @@ -301,7 +301,7 @@ jobs: # Copy Rust build artifacts if [ -d "target/release" ]; then mkdir -p artifacts/rust-build - cp target/release/bootc-image-builder artifacts/rust-build/ 2>/dev/null || echo "Binary copy failed" + cp target/release/apt-ostree-builder artifacts/rust-build/ 2>/dev/null || echo "Binary copy failed" fi echo "Artifacts prepared successfully!" @@ -334,7 +334,7 @@ jobs: echo "📦 Publishing $deb_file..." # Extract package info - PKG_NAME=$(dpkg-deb -f "$deb_file" Package 2>/dev/null || echo "bootc-image-builder") + PKG_NAME=$(dpkg-deb -f "$deb_file" Package 2>/dev/null || echo "apt-ostree-builder") PKG_VERSION=$(dpkg-deb -f "$deb_file" Version 2>/dev/null || echo "unknown") PKG_ARCH=$(dpkg-deb -f "$deb_file" Architecture 2>/dev/null || echo "amd64") @@ -387,7 +387,7 @@ jobs: echo "🎯 Debian package publishing complete!" echo "📦 Packages are now available in Forgejo Debian Registry" - echo "🔧 To install: apt install bootc-image-builder" + echo "🔧 To install: apt install apt-ostree-builder" # Security check security: @@ -423,9 +423,9 @@ jobs: - name: Checkout code run: | - git clone https://git.raines.xyz/particle-os/bootc-image-builder.git /tmp/bootc-image-builder - cp -r /tmp/bootc-image-builder/* . - cp -r /tmp/bootc-image-builder/.* . 2>/dev/null || true + git clone https://git.raines.xyz/particle-os/apt-ostree-builder.git /tmp/apt-ostree-builder + cp -r /tmp/apt-ostree-builder/* . + cp -r /tmp/apt-ostree-builder/.* . 2>/dev/null || true - name: Run security audit run: | @@ -471,9 +471,9 @@ jobs: - name: Checkout code run: | - git clone https://git.raines.xyz/particle-os/bootc-image-builder.git /tmp/bootc-image-builder - cp -r /tmp/bootc-image-builder/* . - cp -r /tmp/bootc-image-builder/.* . 2>/dev/null || true + git clone https://git.raines.xyz/particle-os/apt-ostree-builder.git /tmp/apt-ostree-builder + cp -r /tmp/apt-ostree-builder/* . + cp -r /tmp/apt-ostree-builder/.* . 2>/dev/null || true - name: Validate package structure run: | @@ -533,9 +533,9 @@ jobs: - name: Checkout code run: | - git clone https://git.raines.xyz/particle-os/bootc-image-builder.git /tmp/bootc-image-builder - cp -r /tmp/bootc-image-builder/* . - cp -r /tmp/bootc-image-builder/.* . 2>/dev/null || true + git clone https://git.raines.xyz/particle-os/apt-ostree-builder.git /tmp/apt-ostree-builder + cp -r /tmp/apt-ostree-builder/* . + cp -r /tmp/apt-ostree-builder/.* . 2>/dev/null || true - name: Create status report run: |