Skip to content

Commit 958ebc8

Browse files
committed
Fix curl installation conflict in multi-OS CI workflow
1 parent d451327 commit 958ebc8

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

.github/workflows/multi-os-test.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff 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

0 commit comments

Comments
 (0)