From 6a66ac70806a848b9c9ca45f4dde3cb2121e00a9 Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Tue, 9 Nov 2021 07:25:09 -0800
Subject: [PATCH] further consolidate RPMs into a single tarball per OS
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Taking the previous approach further, this results in the following release
artifacts being combined:

  * CentOS 7
    * 1 source RPM, 2 tarballs → 1 tarball
  * CentOS 8
    * 1 source RPM, 2 tarballs → 1 tarball
  * Fedora 33
    * 1 source RPM, 2 tarballs → 1 tarball
  * Fedora 34
    * 1 source RPM, 2 tarballs → 1 tarball

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

Note that this removes the `os`/`debug`/`source` hierarchy in the packaging
directories for these artifacts, now that all three of these are packaged into a
single tarball. The `os` hierarchy remains for the CMake-produced RPM for these
platforms.

Related to #2147.
---
 .gitlab-ci.yml         | 2 +-
 ci/build.sh            | 6 +-----
 ci/install-packages.sh | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a8f744e0..2bf060eab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,7 @@ portable-source:
         when: on_success
         expire_in: 1 week
         paths:
-            - Packages/*/*/*/*.tar.xz
+            - Packages/*/*/*.tar.xz
             - Packages/*/*/*/*.rpm
             - Metadata/*/*/configure.log
             - GRAPHVIZ_VERSION
diff --git a/ci/build.sh b/ci/build.sh
index c061b1fe2..ffa273a4e 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -71,13 +71,9 @@ else
         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/
             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
+            tar cf - *.rpm | xz -9 -c - >${DIR}/graphviz-${GV_VERSION}-rpms.tar.xz
             popd
         fi
     elif [[ "${OSTYPE}" =~ "darwin" ]]; then
diff --git a/ci/install-packages.sh b/ci/install-packages.sh
index 8439ec783..062322ae6 100755
--- a/ci/install-packages.sh
+++ b/ci/install-packages.sh
@@ -48,7 +48,7 @@ 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
+        tar xvf ${DIR}/graphviz-${GV_VERSION}-rpms.tar.xz
         rpm --install --force \
             graphviz-${GV_VERSION}*.rpm \
             graphviz-libs-${GV_VERSION}*.rpm \
-- 
2.40.0