File tree Expand file tree Collapse file tree 2 files changed +3
-9
lines changed Expand file tree Collapse file tree 2 files changed +3
-9
lines changed Original file line number Diff line number Diff line change 17
17
fail-fast : false
18
18
matrix :
19
19
container :
20
- - fedora:40
21
20
- fedora:41
22
21
- fedora:42
23
22
container :
@@ -42,19 +41,14 @@ jobs:
42
41
43
42
- name : Install dependencies
44
43
run : |
45
- # Install dnf5
46
- if [ "${{ matrix.container }}" = "fedora:40" ] && ! rpm -q dnf5 >/dev/null; then
47
- dnf install dnf5 -y
48
- fi
49
-
50
44
SYSTEM=$(build/bin/sage-guess-package-system)
51
45
if [ "$SYSTEM" = "fedora" ]; then
52
46
# 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=""
54
48
55
49
# Mitigate upstream packaging bug: https://bugzilla.redhat.com/show_bug.cgi?id=2332429
56
50
# 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
58
52
fi
59
53
60
54
eval $(build/bin/sage-print-system-package-command $SYSTEM update)
Original file line number Diff line number Diff line change @@ -154,7 +154,7 @@ case $system:$command in
154
154
@ (fedora* | redhat* | centos* ):install)
155
155
[ " $YES " = yes ] && options=" $options -y"
156
156
[ " $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
158
158
;;
159
159
gentoo* :install)
160
160
[ -n " $system_packages " ] && print_shell_command ${SUDO} emerge $system_packages
You can’t perform that action at this time.
0 commit comments