diff --git a/bin/clean-repo b/bin/clean-repo index aaa230a..90a1918 100755 --- a/bin/clean-repo +++ b/bin/clean-repo @@ -232,12 +232,8 @@ main() { # Update database after cleaning (unless dry run) if [[ "$DRY_RUN" != true ]]; then - print_info "Updating repository database..." - "$BUILD_ROOT/bin/update-repo" >/dev/null 2>&1 && { - echo " -> Database updated successfully!" - } || { - print_warning " -> Database update failed (may need manual update)" - } + # Moved to release workflow + : fi show_disk_usage diff --git a/bin/release b/bin/release index 10c4e0a..8281a7b 100755 --- a/bin/release +++ b/bin/release @@ -18,7 +18,8 @@ echo " 1. Build packages" echo " 2. Sign packages" echo " 3. Promote to production" echo " 4. Clean old versions" -echo " 5. Sync to remote" +echo " 5. Update repository database" +echo " 6. Sync to remote" echo "" # Parse arguments @@ -78,7 +79,7 @@ print_info "Build workspace: $BUILD_OUTPUT_DIR" # Step 1: Build echo "" -print_info "Step 1/5: Building packages..." +print_info "Step 1/6: Building packages..." "$BUILD_ROOT/bin/build" "${BUILD_ARGS[@]}" || { print_error "Build failed" exit 1 @@ -86,7 +87,7 @@ print_info "Step 1/5: Building packages..." # Step 2: Sign echo "" -print_info "Step 2/5: Signing packages..." +print_info "Step 2/6: Signing packages..." "$BUILD_ROOT/bin/sign" --arch "$ARCH" --mirror "$MIRROR" || { print_error "Signing failed" exit 1 @@ -94,23 +95,31 @@ print_info "Step 2/5: Signing packages..." # Step 3: Promote echo "" -print_info "Step 3/5: Promoting to production..." +print_info "Step 3/6: Promoting to production..." "$BUILD_ROOT/bin/promote-build" --arch "$ARCH" --mirror "$MIRROR" || { print_error "Promotion failed" exit 1 } -# Step 4: Clean (which also updates the repo) +# Step 4: Clean echo "" -print_info "Step 4/5: Cleaning old versions..." +print_info "Step 4/6: Cleaning old versions..." "$BUILD_ROOT/bin/clean-repo" --arch "$ARCH" --mirror "$MIRROR" || { print_error "Cleaning failed" exit 1 } -# Step 5: Sync +# Step 5: Update DB echo "" -print_info "Step 5/5: Syncing to remote..." +print_info "Step 5/6: Updating repository database..." +"$BUILD_ROOT/bin/update-repo" --arch "$ARCH" --mirror "$MIRROR" || { + print_error "Database update failed" + exit 1 +} + +# Step 6: Sync +echo "" +print_info "Step 6/6: Syncing to remote..." SYNC_ARGS=("--mirror" "$MIRROR" "--arch" "$ARCH") if [[ -n "$SYNC_REMOTE" ]]; then SYNC_ARGS+=("--remote" "$SYNC_REMOTE") diff --git a/bin/repo b/bin/repo index 405a452..3edcfef 100755 --- a/bin/repo +++ b/bin/repo @@ -32,7 +32,7 @@ show_usage() { echo "Usage: $0 [options]" echo "" echo "Commands:" - echo " release Run complete workflow: build → sign → promote → clean → sync" + echo " release Run complete workflow: build → sign → promote → clean → update → sync" echo " build Build AUR packages (unsigned)" echo " sign Sign all packages in build-output" echo " promote Promote build to production (build-output → pkgs.omarchy.org)" @@ -49,6 +49,7 @@ show_usage() { echo " $0 sign" echo " $0 promote" echo " $0 clean" + echo " $0 update" echo " $0 sync pkgs.omarchy.org/x86_64" echo "" echo "For command-specific help, use:"