From 01913f76821046f67ba8139bf47e1c64ce16241f Mon Sep 17 00:00:00 2001 From: alvinlollo Date: Thu, 8 Oct 2026 18:46:47 +1100 Subject: [PATCH] feat(jobs): Output conflicting packages --- .gitea/workflows/tests.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/tests.yaml b/.gitea/workflows/tests.yaml index 04d1d86..c0c8a4e 100644 --- a/.gitea/workflows/tests.yaml +++ b/.gitea/workflows/tests.yaml @@ -316,13 +316,13 @@ jobs: PKGS+=("$pkg") done < packages.x86_64 - # Use pacman -Sp --print to resolve the full install set and check for conflicts - # This catches "X and Y are in conflict" errors before the ISO build - PKG_LIST=$(printf '%s\n' "${PKGS[@]}") - if CONFLICTS=$(echo "$PKG_LIST" | pacman -Sp --needed - 2>&1); then + # Run pacman directly with the array to catch conflict errors + if CONFLICTS=$(pacman -Sp --needed "${PKGS[@]}" 2>&1); then echo "✅ No package conflicts detected" else - echo "$CONFLICTS" | grep -i "conflict" || true + echo "------- Pacman Output -------" + echo "$CONFLICTS" + echo "-----------------------------" echo "" echo "═══════════════════════════════════════════════════════════════" echo " ❌ Conflicting packages found — fix packages.x86_64"