From 0554b1c684ceaef36db0092bec19da5ea1f3f0d7 Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Sun, 26 Oct 2025 19:38:19 -0400 Subject: [PATCH] Simplify build to only local. --- build/build.sh | 398 +++++++++---------------------------------------- 1 file changed, 71 insertions(+), 327 deletions(-) diff --git a/build/build.sh b/build/build.sh index 81407ff..94c61f5 100755 --- a/build/build.sh +++ b/build/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Build script that handles both AUR and GitHub packages inside Docker container +# Simplified build script - builds all packages in /pkgbuilds/ # Import GPG keys /build/import-gpg-keys.sh || exit 1 @@ -24,10 +24,9 @@ fi # Sync pacman database sudo pacman -Sy -echo "==> Package Builder (AUR & GitHub)" +echo "==> Package Builder" echo "==> Target architecture: $ARCH" echo "==> Output directory: $OUTPUT_DIR" -echo "==> Processing omarchy-aur.packages" mkdir -p "$OUTPUT_DIR" @@ -39,99 +38,49 @@ SKIPPED_PACKAGES="" get_local_version() { local pkg="$1" if [[ -f "$OUTPUT_DIR/omarchy.db.tar.zst" ]]; then - # Find the exact desc file for this package - # For VCS packages, version might start with 'r' instead of a digit local desc_file=$(tar -tf "$OUTPUT_DIR/omarchy.db.tar.zst" | grep "^${pkg}-[0-9r].*/desc$" | head -1) - if [[ -n "$desc_file" ]]; then - # Extract that specific file and get the version tar -xOf "$OUTPUT_DIR/omarchy.db.tar.zst" "$desc_file" 2>/dev/null | awk '/%VERSION%/{getline; print; exit}' fi fi } -# Common build logic for all package types -# Expects to be called with pkg directory already prepared in /src/$pkg +# Build a package from /pkgbuilds/ build_package() { local pkg="$1" - local opts="$2" - local check_repo="$3" # Optional: repository to check for updates (for -git packages) - + + echo "" + echo " -> Processing: $pkg" + + # Copy to build directory + cd /src + rm -rf "$pkg" + cp -r "/pkgbuilds/$pkg" "$pkg" cd "/src/$pkg" || return 1 - - # Handle version checking - local should_build=true - - # Check for always-build option - if [[ "$opts" == *"always-build"* ]]; then - echo " Note: Package flagged as always-build, will use timestamp version" - - # Inject timestamp into pkgver to ensure unique filename - local timestamp=$(date +%Y%m%d.%H%M%S) - echo " Injecting timestamp: $timestamp" - - if grep -q '^pkgver=' PKGBUILD; then - local current_pkgver=$(grep '^pkgver=' PKGBUILD | cut -d'=' -f2 | tr -d "'\"") - sed -i "s/^pkgver=.*/pkgver=${current_pkgver}.${timestamp}/" PKGBUILD - echo " Modified pkgver to: ${current_pkgver}.${timestamp}" - fi - elif [[ "$pkg" == *-git ]] && [[ -n "$check_repo" ]]; then - # For -git packages, check if we need to rebuild based on commit - local latest_commit=$(git ls-remote "https://github.com/${check_repo}.git" HEAD 2>/dev/null | cut -f1 | head -c 7) - - if [[ -n "$latest_commit" ]]; then - local local_version=$(get_local_version "$pkg") - - if [[ -n "$local_version" ]]; then - # Extract commit hash from version (format: r.-) - local local_commit=$(echo "$local_version" | grep -oE '\.[a-f0-9]{7}' | cut -d'.' -f2) - - if [[ "$local_commit" == "$latest_commit" ]]; then - echo " ✓ Up to date: commit $latest_commit - Skipping" - SKIPPED_PACKAGES="$SKIPPED_PACKAGES $pkg" - should_build=false - else - echo " Update available: $local_commit -> $latest_commit" - fi - else - echo " New package (commit: $latest_commit)" - fi - fi - elif [[ ! "$pkg" == *-git ]]; then - # For non-git packages, check PKGBUILD version - local pkgbuild_version=$(bash -c 'source PKGBUILD; echo "${pkgver}-${pkgrel}"' 2>/dev/null) - - if [[ -n "$pkgbuild_version" ]]; then - local local_version=$(get_local_version "$pkg") - - if [[ "$local_version" == "$pkgbuild_version" ]]; then - echo " ✓ Up to date: $local_version - Skipping" - SKIPPED_PACKAGES="$SKIPPED_PACKAGES $pkg" - should_build=false - elif [[ -n "$local_version" ]]; then - echo " Update available: $local_version -> $pkgbuild_version" - else - echo " New package (version: $pkgbuild_version)" - fi - fi + + # Get PKGBUILD version + local pkgbuild_version=$(bash -c 'source PKGBUILD; echo "${pkgver}-${pkgrel}"' 2>/dev/null) + + if [[ -z "$pkgbuild_version" ]]; then + echo " ❌ Failed to read PKGBUILD version" + FAILED_PACKAGES="$FAILED_PACKAGES $pkg" + return 1 fi - - # If package is up to date but has install flag, install it for dependencies - if [[ "$should_build" == false ]] && [[ "$opts" == *"install"* ]]; then - echo " Installing existing package for dependencies..." - local latest_pkg=$(ls -t $OUTPUT_DIR/${pkg}-*.pkg.tar.* 2>/dev/null | grep -v '\.sig$' | head -1) - if [[ -f "$latest_pkg" ]]; then - sudo pacman -U --noconfirm --needed "$latest_pkg" 2>/dev/null || true - fi + + # Check if already built + local local_version=$(get_local_version "$pkg") + + if [[ "$local_version" == "$pkgbuild_version" ]]; then + echo " ✓ Up to date: $local_version - Skipping" + SKIPPED_PACKAGES="$SKIPPED_PACKAGES $pkg" return 0 + elif [[ -n "$local_version" ]]; then + echo " Update available: $local_version -> $pkgbuild_version" + else + echo " New package (version: $pkgbuild_version)" fi - - # Skip building if not needed - if [[ "$should_build" == false ]]; then - return 0 - fi - + # Import package-specific PGP keys if they exist if [[ -d "keys/pgp" ]]; then echo " Importing package-specific PGP keys..." @@ -141,10 +90,10 @@ build_package() { fi done fi - + # Build package with signing MAKEPKG_FLAGS="-scf --noconfirm" - + # Only add sign flag if we have a GPG key configured if grep -q "^GPGKEY=" ~/.makepkg.conf 2>/dev/null; then GPG_KEY=$(grep "^GPGKEY=" ~/.makepkg.conf | cut -d'"' -f2) @@ -153,23 +102,12 @@ build_package() { else echo " No GPG key configured in makepkg.conf" fi - - # Check for skip-pgp in options - if [[ "$opts" == *"skip-pgp"* ]]; then - MAKEPKG_FLAGS="$MAKEPKG_FLAGS --skippgpcheck" - echo " (skipping PGP verification)" - fi - + if makepkg $MAKEPKG_FLAGS; then # Copy to output (including signature files) for pkg_file in *.pkg.tar.*; do if [[ -f "$pkg_file" ]]; then cp "$pkg_file" $OUTPUT_DIR/ - # Check for install option to make package available for dependencies - if [[ "$opts" == *"install"* ]] && [[ "$pkg_file" =~ ^${pkg}-[0-9].*\.pkg\.tar\..* ]] && [[ "$pkg_file" != *.sig ]]; then - echo " Installing locally for dependencies..." - sudo pacman -U --noconfirm --needed "$pkg_file" 2>/dev/null || true - fi fi done echo " ✓ Successfully built $pkg" @@ -182,245 +120,51 @@ build_package() { fi } -# Prepare and build a local PKGBUILD package -build_local_package() { - local pkg="$1" - local opts="$2" - - # Check if package exists locally - if [[ ! -d "/pkgbuilds/$pkg" ]] || [[ ! -f "/pkgbuilds/$pkg/PKGBUILD" ]]; then - return 1 # Not a local package - fi - - echo "" - echo " -> Processing local: $pkg..." - echo " Source: /pkgbuilds/$pkg" - - # Check for source repo override for -git packages - local check_repo="" - if [[ "$opts" =~ source:([^ ]+) ]]; then - check_repo="${BASH_REMATCH[1]}" - echo " Update check repository: $check_repo" - fi - - # Copy to build directory - cd /src - rm -rf "$pkg" - cp -r "/pkgbuilds/$pkg" "$pkg" - - # Build the package - build_package "$pkg" "$opts" "$check_repo" - local result=$? - - cd /src - return $result -} - -# Build a GitHub package -build_github_package() { - local github_repo="$1" - local opts="$2" - - echo "" - echo " -> Processing GitHub: $github_repo..." - - # Extract owner and repo name - local owner=$(echo "$github_repo" | cut -d'/' -f1) - local repo=$(echo "$github_repo" | cut -d'/' -f2) - - if [[ -z "$owner" ]] || [[ -z "$repo" ]]; then - echo " ❌ Invalid GitHub format. Use: owner/repo" - FAILED_PACKAGES="$FAILED_PACKAGES $github_repo" - return 1 - fi - - # Use repo name as package name for local tracking - local pkg="$repo" - - echo " GitHub repository: https://github.com/$github_repo" - - # Check for source repo override for -git packages - local check_repo="" - if [[ "$opts" =~ source:([^ ]+) ]]; then - check_repo="${BASH_REMATCH[1]}" - echo " Update check repository: $check_repo" - elif [[ "$pkg" == *-git ]]; then - # Default to the GitHub repo for checking updates - check_repo="$github_repo" - fi - - # Fresh clone for building - cd /src - rm -rf "$pkg" - - git clone "https://github.com/${github_repo}.git" "$pkg" || { - echo " ❌ Failed to clone $github_repo" - FAILED_PACKAGES="$FAILED_PACKAGES $github_repo" - return 1 - } - - cd "$pkg" - - # Check if PKGBUILD exists - if [[ ! -f "PKGBUILD" ]]; then - echo " ❌ No PKGBUILD found in repository" - FAILED_PACKAGES="$FAILED_PACKAGES $github_repo" - cd /src - return 1 - fi - - # Build the package using common logic - build_package "$pkg" "$opts" "$check_repo" - local result=$? - - cd /src - return $result -} - -# Build an AUR package -build_aur_package() { - local pkg="$1" - local opts="$2" - - echo "" - echo " -> Processing AUR: $pkg..." - - # Get version from AUR API (also gets package base) - local aur_info=$(curl -s "https://aur.archlinux.org/rpc/?v=5&type=info&arg[]=$pkg") - local aur_version=$(echo "$aur_info" | jq -r '.results[0].Version // empty') - local pkg_base=$(echo "$aur_info" | jq -r '.results[0].PackageBase // empty') - - if [[ -z "$aur_version" ]]; then - echo " ❌ Package not found in AUR" - FAILED_PACKAGES="$FAILED_PACKAGES $pkg" - return 1 - fi - - # Use package name as base if not specified - if [[ -z "$pkg_base" ]]; then - pkg_base="$pkg" - elif [[ "$pkg_base" != "$pkg" ]]; then - echo " Using package base: $pkg_base" - fi - - # Check if we need to build (quick check before cloning) - local local_version=$(get_local_version "$pkg") - - if [[ "$local_version" == "$aur_version" ]]; then - echo " ✓ Up to date: $local_version - Skipping" - SKIPPED_PACKAGES="$SKIPPED_PACKAGES $pkg" - - # If install option is set, install the existing package for dependencies - if [[ "$opts" == *"install"* ]]; then - echo " Installing existing package for dependencies..." - local latest_pkg=$(ls -t $OUTPUT_DIR/${pkg}-[0-9]*.pkg.tar.* 2>/dev/null | grep -v '\.sig$' | head -1) - if [[ -f "$latest_pkg" ]]; then - sudo pacman -U --noconfirm --needed "$latest_pkg" 2>/dev/null || true - fi - fi - return 0 - elif [[ -n "$local_version" ]]; then - echo " Update available: $local_version -> $aur_version" - else - echo " New package (AUR: $aur_version)" - fi - - # Clone from AUR - cd /src - rm -rf "$pkg" - - git clone "https://aur.archlinux.org/${pkg_base}.git" "$pkg" || { - echo " ❌ Failed to clone $pkg_base" - FAILED_PACKAGES="$FAILED_PACKAGES $pkg" - return 1 - } - - # Build the package using common logic - # No check_repo for AUR packages - version checking is done above - build_package "$pkg" "$opts" "" - local result=$? - - cd /src - return $result -} - # Main execution cd /src -# Determine input source: single package or package file -if [[ -n "$SINGLE_PACKAGE" ]]; then - echo "==> Single Package Build Mode: $SINGLE_PACKAGE" - PACKAGE_INPUT=$(echo "$SINGLE_PACKAGE") -else - echo "==> Processing omarchy-aur.packages" - PACKAGE_INPUT=$(cat /build/packages/omarchy-aur.packages) -fi +TOTAL_COUNT=0 -# Read and process packages -if [[ -n "$PACKAGE_INPUT" ]]; then - TOTAL_COUNT=0 +# Build all packages in /pkgbuilds/ +for pkgdir in /pkgbuilds/*/; do + [[ ! -d "$pkgdir" ]] && continue + + pkg=$(basename "$pkgdir") + + # Skip if no PKGBUILD exists + [[ ! -f "$pkgdir/PKGBUILD" ]] && continue + + ((TOTAL_COUNT++)) + + build_package "$pkg" +done - while IFS= read -r line || [ -n "$line" ]; do - [[ "$line" =~ ^#.*$ ]] && continue - [[ -z "$line" ]] && continue +echo "" +echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" +echo "==> Build Summary" +echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" - ((TOTAL_COUNT++)) +# Count results +SUCCESS_COUNT=$(echo $SUCCESSFUL_PACKAGES | wc -w) +SKIPPED_COUNT=$(echo $SKIPPED_PACKAGES | wc -w) +FAILED_COUNT=$(echo $FAILED_PACKAGES | wc -w) - # Parse package name and options - package=$(echo "$line" | awk '{print $1}') - options=$(echo "$line" | awk '{$1=""; print $0}' | xargs) - - # Check build source in priority order: - # 1. Local PKGBUILD in /pkgbuilds/ - # 2. GitHub repository (contains /) - # 3. AUR package - - # Try local package first - if build_local_package "$package" "$options"; then - # Package was handled locally (either built, skipped, or failed) - continue - fi - - # Check if this is a GitHub package (contains /) - if [[ "$package" == *"/"* ]]; then - # GitHub package format: owner/repo - build_github_package "$package" "$options" - else - # Regular AUR package - build_aur_package "$package" "$options" - fi - done <<< "$PACKAGE_INPUT" +echo " Total packages: $TOTAL_COUNT" +echo " ✓ Built: $SUCCESS_COUNT" +echo " ⏭ Skipped: $SKIPPED_COUNT (already up-to-date)" +echo " ❌ Failed: $FAILED_COUNT" +# List failures if any +if [[ -n "$FAILED_PACKAGES" ]]; then echo "" - echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" - echo "==> Build Summary" - echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" - - # Count results - SUCCESS_COUNT=$(echo $SUCCESSFUL_PACKAGES | wc -w) - SKIPPED_COUNT=$(echo $SKIPPED_PACKAGES | wc -w) - FAILED_COUNT=$(echo $FAILED_PACKAGES | wc -w) - - echo " Total packages: $TOTAL_COUNT" - echo " ✓ Built: $SUCCESS_COUNT" - echo " ⏭ Skipped: $SKIPPED_COUNT (already up-to-date)" - echo " ❌ Failed: $FAILED_COUNT" - - # List failures if any - if [[ -n "$FAILED_PACKAGES" ]]; then - echo "" - echo "Failed packages:" - for pkg in $FAILED_PACKAGES; do - echo " - $pkg" - done - echo "" - echo "==> Some packages failed to build" - exit 1 - else - echo "" - echo "==> All packages processed successfully!" - fi -else - echo "Error: No packages to build" + echo "Failed packages:" + for pkg in $FAILED_PACKAGES; do + echo " - $pkg" + done + echo "" + echo "==> Some packages failed to build" exit 1 +else + echo "" + echo "==> All packages processed successfully!" fi