Skip to content

Commit

Permalink
ci: attempt fix fedora
Browse files Browse the repository at this point in the history
  • Loading branch information
balupton committed Nov 30, 2024
1 parent af962c5 commit cfec77c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/dorothy-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,17 +235,16 @@ jobs:
elif command -v urpmi; then
# for mageia, prefer over fedora as mageia also contains dnf
# https://wiki.mageia.org/en/Cauldron
# --allowerasing needed due to: https://github.com/bevry/dorothy/actions/runs/6033044029/job/16369147940
# https://github.com/bevry/dorothy/actions/runs/6033044029/job/16369147940
# https://github.com/bevry/dorothy/actions/runs/6033557632/job/16370418074
# urpmi --auto-update --auto
# dnf check-update --assumeyes
# dnf upgrade --assumeyes --refresh --best --allowerasing
# ^ disabled as always fails
urpmi.update -a
# ^ this fails too: https://github.com/bevry/dorothy/actions/runs/6033557632/job/16370418074
urpmi --auto bash curl
elif command -v dnf; then
# for fedora
dnf --assumeyes --refresh --best --allowerasing install bash curl
# dnf check-update --assumeyes
# dnf upgrade --assumeyes --refresh --best --allowerasing
dnf install --assumeyes --refresh --best --allowerasing bash curl
elif command -v xbps-install; then
# for void linux
xbps-install --sync --update --yes xbps
Expand Down
2 changes: 1 addition & 1 deletion commands/dorothy
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ function dorothy_() (
__try_sudo urpmi --auto bash curl git gawk
elif __command_exists -- dnf; then
# for fedora
__try_sudo dnf --assumeyes --refresh --best --allowerasing install bash curl git coreutils moreutils gawk
__try_sudo dnf install --assumeyes --refresh --best --allowerasing bash curl git coreutils moreutils gawk
elif [[ -n ${HOMEBREW_PREFIX-} && -x "$HOMEBREW_PREFIX/bin/brew" ]]; then
# this is here for consistency only, as it is unnecessary, all the commands already exist on macos without any need for homebrew
"$HOMEBREW_PREFIX/bin/brew" install bash curl git coreutils moreutils gawk
Expand Down

0 comments on commit cfec77c

Please sign in to comment.