Issue #131: Debug CI

Signed-off-by: Mike Detwiler <mike@detwiler.io>
detwiler · Dec 10, 2022 · 9964409 · 9964409
1 parent 796ef11
commit 9964409
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,7 +33,13 @@ jobs:
           . /etc/os-release
           case $ID in
               alpine) apk update && apk upgrade && apk add git tar;;
-              centos|fedora|rhel) dnf -y upgrade && dnf -y install dnf-plugins-core git-core which;;
+              centos)
+                  case $VERSION_ID in
+                        7) yum -y install dnf;;
+                  esac
+                  dnf -y upgrade && dnf -y install dnf-plugins-core git-core which
+              ;;
+              fedora|rhel) dnf -y upgrade && dnf -y install dnf-plugins-core git-core which;;
               debian|ubuntu) apt-get -y update && apt-get -y upgrade && apt-get -y install git;;
           esac
 

diff --git a/build-aux/install-buildreqs b/build-aux/install-buildreqs
@@ -28,7 +28,7 @@ case $ID in
                 repo_pkgs='centos-release-scl epel-release'
                 enable_repos=
                 pkgs_centos=rh-git227
-		$SUDO yum --assumeyes install dnf
+		$SUDO yum --assumeyes install dnf dnf-plugins-core
                 ;;
             8)
                 repo_pkgs='epel-release epel-next-release'

diff --git a/build-aux/install-reqs b/build-aux/install-reqs
@@ -80,7 +80,7 @@ case $ID in
                 repo_pkgs=epel-release
                 enable_repos=
 		pkgs_centos="$pkgs_centos python3-devel"
-		$SUDO yum --assumeyes install dnf
+		$SUDO yum --assumeyes install dnf dnf-plugins-core
                 ;;
             8)
                 repo_pkgs='epel-release epel-next-release'