From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Mon, 7 Feb 2022 07:44:11 +0000 (+1100)
Subject: CI: on RHEL distros, install all RPMs
X-Git-Tag: 3.0.0~37^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6f8a88a4b43b97d7b38390bf56ce61fdd80ca6a;p=graphviz

CI: on RHEL distros, install all RPMs

Commit c334e4e81aad15d3092d7c25038a4d2cf1cbff05 altered this step to only
install RPMs necessary for the test suite at the time. However, an upcoming
commit that enables `dot_builtins` causes graphviz-nox-* to depend on
libgvplugin_webp.so.6 that was not being installed. For simplicity, the present
commit reverts c334e4e81aad15d3092d7c25038a4d2cf1cbff05.

Note that this more closely matches the only reasonable way to use the
CI-produced RPMs: install all of them.

Gitlab: related to #1839
---

diff --git a/ci/install-packages.sh b/ci/install-packages.sh
index a9a1d3064..f6418196e 100755
--- a/ci/install-packages.sh
+++ b/ci/install-packages.sh
@@ -52,16 +52,6 @@ else
         cp -rp build/* /usr/local
     else
         tar xvf ${DIR}/graphviz-${GV_VERSION}-rpms.tar.xz
-        rpm --install --force \
-            graphviz-${GV_VERSION}*.rpm \
-            graphviz-libs-${GV_VERSION}*.rpm \
-            graphviz-devel-${GV_VERSION}*.rpm \
-            graphviz-plugins-core-${GV_VERSION}*.rpm \
-            graphviz-plugins-x-${GV_VERSION}*.rpm \
-            graphviz-x-${GV_VERSION}*.rpm \
-            graphviz-gd-${GV_VERSION}*.rpm \
-            graphviz-qt-${GV_VERSION}*.rpm \
-            graphviz-plugins-gd-${GV_VERSION}*.rpm \
-            graphviz-nox-${GV_VERSION}*.rpm
+        rpm --install --force graphviz-*${GV_VERSION}*.rpm
     fi
 fi