File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -102,13 +102,16 @@ jobs:
102102 ${{ matrix.package_manager }} update -y -q
103103
104104 # Handle curl/curl-minimal conflict in minimal containers
105- if ${{ matrix.package_manager }} list installed | grep -q curl-minimal; then
105+ if rpm -q curl-minimal &>/dev/null ; then
106106 echo "curl-minimal detected, removing before installing full curl..."
107107 ${{ matrix.package_manager }} remove -y curl-minimal || true
108+ # Clear dnf cache after removal
109+ ${{ matrix.package_manager }} clean all || true
108110 fi
109111
110- ${{ matrix.package_manager }} install -y -q curl wget socat cronie procps-ng || \
111- ${{ matrix.package_manager }} install -y -q curl wget socat cron procps-ng || {
112+ # Install packages with conflict resolution
113+ ${{ matrix.package_manager }} install -y --allowerasing curl wget socat cronie procps-ng || \
114+ ${{ matrix.package_manager }} install -y --allowerasing curl wget socat cron procps-ng || {
112115 echo "⚠️ Some packages failed to install, continuing with available tools..."
113116 }
114117
You can’t perform that action at this time.
0 commit comments