further consolidate DEBs into a single tarball per OS

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

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

This drops the total number of Graphviz release artifacts from 63 to 58. 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 DEB for these
platforms.

Related to #2147.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a307f5a4ca8df49f52739b0a4dc0e1d0f7f70a2a..dc03fcb7b993f14eca74ff2a20f253322743774d 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,7 +68,7 @@ portable-source:
         when: on_success
         expire_in: 1 week
         paths:
-            - Packages/*/*/*/*.tar.xz
+            - Packages/*/*/*.tar.xz
             - Packages/*/*/*/*deb
             - Metadata/*/*/configure.log
             - GRAPHVIZ_VERSION

diff --git a/ci/build.sh b/ci/build.sh
index c713dbdf4c0c78ff5516a84dabed1f4cbaa3f134..711637a45b3dbdb2d209d395a838b2b87e674145 100755 (executable)
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -67,8 +67,7 @@ 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)
-            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
+            tar cf - *.deb *.ddeb | xz -9 -c - >${DIR}/graphviz-${GV_VERSION}-debs.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 e70370aab585ced8dc24bafb10204269104d56a7..82369ace8b30c45d1689b8ab2fab086d8ceddd5a 100755 (executable)
--- a/ci/install-packages.sh
+++ b/ci/install-packages.sh
@@ -41,7 +41,7 @@ if [ "${build_system}" = "cmake" ]; then
     fi
 else
     if [ "${ID_LIKE}" = "debian" ]; then
-        tar xf ${DIR}/os/graphviz-${GV_VERSION}-debs.tar.xz
+        tar xf ${DIR}/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