package RPMs as consolidated tarballs

This results in the following release artifacts being combined:

  * CentOS 7
    * 1 debug RPMs → 1 tarball
    * 22 other RPMs → 1 tarball
  * CentOS 8
    * 20 debug RPMs → 1 tarball
    * 23 other RPMs → 1 tarball
  * Fedora 33
    * 25 debug RPMs → 1 tarball
    * 28 other RPMs → 1 tarball
  * Fedora 34
    * 25 debug RPMs → 1 tarball
    * 28 other RPMs → 1 tarball

This drops the total number of Graphviz release artifacts from 340 to 176. This
is still not below the 50 artifact ceiling we need to hit, but this is
significant progress.

Related to #2147.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66cc15b9f90847944de6823f4d504afbe63e2645..3a8f744e04f5598538c34735c87cba2c1fb654b0 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,6 +46,7 @@ portable-source:
         when: on_success
         expire_in: 1 week
         paths:
+            - Packages/*/*/*/*.tar.xz
             - Packages/*/*/*/*.rpm
             - Metadata/*/*/configure.log
             - GRAPHVIZ_VERSION

diff --git a/ci/build.sh b/ci/build.sh
index f747dac4cb3b4efce3508e31428ec4355d8b00f8..c061b1fe2708dbf22795c56365383c6bcacd3471 100755 (executable)
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -19,7 +19,7 @@ else
 fi
 META_DATA_DIR=Metadata/${ID}/${VERSION_ID}
 mkdir -p ${META_DATA_DIR}
-DIR=Packages/${ID}/${VERSION_ID}
+DIR=$(pwd)/Packages/${ID}/${VERSION_ID}
 ARCH=$( uname -m )
 mkdir -p ${DIR}/os
 mkdir -p ${DIR}/debug
@@ -72,8 +72,13 @@ else
             rm -rf ${HOME}/rpmbuild
             rpmbuild -ta graphviz-${GV_VERSION}.tar.gz | tee >(ci/extract-configure-log.sh >${META_DATA_DIR}/configure.log)
             mv ${HOME}/rpmbuild/SRPMS/*.src.rpm ${DIR}/source/
-            mv ${HOME}/rpmbuild/RPMS/*/*debuginfo*rpm ${DIR}/debug/
-            mv ${HOME}/rpmbuild/RPMS/*/*.rpm ${DIR}/os/
+            pushd ${HOME}/rpmbuild/RPMS
+            mv */*debuginfo*rpm ./
+            tar cf - *debuginfo*rpm | xz -9 -c - >${DIR}/debug/graphviz-${GV_VERSION}-debuginfo-rpms.tar.xz
+            find . -name "*debuginfo*rpm" -delete
+            mv */*.rpm ./
+            tar cf - *.rpm | xz -9 -c - >${DIR}/os/graphviz-${GV_VERSION}-rpms.tar.xz
+            popd
         fi
     elif [[ "${OSTYPE}" =~ "darwin" ]]; then
         ./autogen.sh

diff --git a/ci/install-packages.sh b/ci/install-packages.sh
index 7253028f3fe9575972bafed36e509e5ea671011b..8439ec783abed0212e04fd342a6b783edd73863a 100755 (executable)
--- a/ci/install-packages.sh
+++ b/ci/install-packages.sh
@@ -48,16 +48,17 @@ else
         tar xf ${DIR}/os/graphviz-${GV_VERSION}-${ARCH}.tar.gz
         cp -rp build/* /usr/local
     else
+        tar xvf ${DIR}/os/graphviz-${GV_VERSION}-rpms.tar.xz
         rpm --install --force \
-            ${DIR}/os/graphviz-${GV_VERSION}*.rpm \
-            ${DIR}/os/graphviz-libs-${GV_VERSION}*.rpm \
-            ${DIR}/os/graphviz-devel-${GV_VERSION}*.rpm \
-            ${DIR}/os/graphviz-plugins-core-${GV_VERSION}*.rpm \
-            ${DIR}/os/graphviz-plugins-x-${GV_VERSION}*.rpm \
-            ${DIR}/os/graphviz-x-${GV_VERSION}*.rpm \
-            ${DIR}/os/graphviz-gd-${GV_VERSION}*.rpm \
-            ${DIR}/os/graphviz-qt-${GV_VERSION}*.rpm \
-            ${DIR}/os/graphviz-plugins-gd-${GV_VERSION}*.rpm \
-            ${DIR}/os/graphviz-nox-${GV_VERSION}*.rpm
+            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
     fi
 fi