From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Tue, 9 Nov 2021 04:39:13 +0000 (-0800)
Subject: package DEBs as consolidated tarballs
X-Git-Tag: 2.50.0~37^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=722181dff82c7f6728507a57f88af0d508cdc644;p=graphviz

package DEBs as consolidated tarballs

This results in the following release artifacts being combined:

  * Ubuntu 18.04
    * 13 DEBs → 1 tarball
    * 10 debug DEBs → 1 tarball
  * Ubuntu 20.04
    * 13 DEBs → 1 tarball
    * 10 debug DEBs → 1 tarball
  * Ubuntu 20.04 debug
    * 13 DEBs → 1 tarball
    * 10 debug DEBs → 1 tarball
  * Ubuntu 21.04
    * 13 DEBs → 1 tarball
    * 10 debug DEBs → 1 tarball
  * Ubuntu 21.10
    * 13 DEBs → 1 tarball
    * 10 debug DEBs → 1 tarball

This drops the total number of Graphviz release artifacts from 168 to 63. 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 214ff9bef..a307f5a4c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,6 +68,7 @@ portable-source:
         when: on_success
         expire_in: 1 week
         paths:
+            - Packages/*/*/*/*.tar.xz
             - Packages/*/*/*/*deb
             - Metadata/*/*/configure.log
             - GRAPHVIZ_VERSION
diff --git a/ci/build.sh b/ci/build.sh
index 2ce64463f..c713dbdf4 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -67,8 +67,8 @@ else
         if [ "${ID_LIKE:-}" = "debian" ]; then
             tar xfz graphviz-${GV_VERSION}.tar.gz
             (cd graphviz-${GV_VERSION}; fakeroot make -f debian/rules binary) | tee >(ci/extract-configure-log.sh >${META_DATA_DIR}/configure.log)
-            mv *.deb ${DIR}/os/
-            mv *.ddeb ${DIR}/debug/
+            tar cf - *.deb | xz -9 -c - >${DIR}/os/graphviz-${GV_VERSION}-debs.tar.xz
+            tar cf - *.ddeb | xz -9 -c - >${DIR}/debug/graphviz-${GV_VERSION}-ddebs.tar.xz
         else
             rm -rf ${HOME}/rpmbuild
             rpmbuild -ta graphviz-${GV_VERSION}.tar.gz | tee >(ci/extract-configure-log.sh >${META_DATA_DIR}/configure.log)
diff --git a/ci/install-packages.sh b/ci/install-packages.sh
index 590bbba37..e70370aab 100755
--- a/ci/install-packages.sh
+++ b/ci/install-packages.sh
@@ -41,9 +41,10 @@ if [ "${build_system}" = "cmake" ]; then
     fi
 else
     if [ "${ID_LIKE}" = "debian" ]; then
-        apt install ./${DIR}/os/libgraphviz4_${GV_VERSION}-1_amd64.deb
-        apt install ./${DIR}/os/libgraphviz-dev_${GV_VERSION}-1_amd64.deb
-        apt install ./${DIR}/os/graphviz_${GV_VERSION}-1_amd64.deb
+        tar xf ${DIR}/os/graphviz-${GV_VERSION}-debs.tar.xz
+        apt install ./libgraphviz4_${GV_VERSION}-1_amd64.deb
+        apt install ./libgraphviz-dev_${GV_VERSION}-1_amd64.deb
+        apt install ./graphviz_${GV_VERSION}-1_amd64.deb
     elif [ "${ID}" = "Darwin" ]; then
         tar xf ${DIR}/os/graphviz-${GV_VERSION}-${ARCH}.tar.gz
         cp -rp build/* /usr/local