]> granicus.if.org Git - graphviz/commitdiff
CI: on RHEL distros, install all RPMs
authorMatthew Fernandez <matthew.fernandez@gmail.com>
Mon, 7 Feb 2022 07:44:11 +0000 (18:44 +1100)
committerMatthew Fernandez <matthew.fernandez@gmail.com>
Wed, 9 Feb 2022 06:03:18 +0000 (17:03 +1100)
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

ci/install-packages.sh

index a9a1d3064e3768fc0df4a49b8dc17ec0102941f1..f6418196e54137c6822f36a932ec2bc5694cc176 100755 (executable)
@@ -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