Skip to content

Commit 07925db

Browse files
authored
Remove fedora 40 and use dnf inplace of dnf5
1 parent 27eb127 commit 07925db

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
container:
20-
- fedora:40
2120
- fedora:41
2221
- fedora:42
2322
container:
@@ -42,19 +41,14 @@ jobs:
4241
4342
- name: Install dependencies
4443
run: |
45-
# Install dnf5
46-
if [ "${{ matrix.container }}" = "fedora:40" ] && ! rpm -q dnf5 >/dev/null; then
47-
dnf install dnf5 -y
48-
fi
49-
5044
SYSTEM=$(build/bin/sage-guess-package-system)
5145
if [ "$SYSTEM" = "fedora" ]; then
5246
# Need to use --setopt=tsflags="" to avoid errors with gphelp
53-
dnf5 install -y pari-gp --setopt=tsflags=""
47+
dnf install -y pari-gp --setopt=tsflags=""
5448
5549
# Mitigate upstream packaging bug: https://bugzilla.redhat.com/show_bug.cgi?id=2332429
5650
# by swapping the incorrectly installed OpenCL-ICD-Loader for the expected ocl-icd
57-
dnf5 -y swap --repo='fedora' OpenCL-ICD-Loader ocl-icd
51+
dnf -y swap --repo='fedora' OpenCL-ICD-Loader ocl-icd
5852
fi
5953
6054
eval $(build/bin/sage-print-system-package-command $SYSTEM update)

build/bin/sage-print-system-package-command

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ case $system:$command in
154154
@(fedora*|redhat*|centos*):install)
155155
[ "$YES" = yes ] && options="$options -y"
156156
[ "$IGNORE_MISSING" = yes ] && options="$options --skip-unavailable"
157-
[ -n "$system_packages" ] && print_shell_command ${SUDO}dnf5 install $options $system_packages
157+
[ -n "$system_packages" ] && print_shell_command ${SUDO}dnf install $options $system_packages
158158
;;
159159
gentoo*:install)
160160
[ -n "$system_packages" ] && print_shell_command ${SUDO}emerge $system_packages

0 commit comments

Comments
 (0)