rename CMake-produced DEB t *-cmake to disambiguate

Now that the Autotools-produced DEBs are consolidated into tarballs, someone
looking at a flat list of all the release artifacts could incorrectly conclude
that Graphviz-${GV_VERSION}-Linux.deb is an alternative complete package to the
tarballs. Renaming this makes it clearer that it originates from the CMake build
system and is incomplete.

Note that this also removes the `os` hierarchy in the packaging directories for
these artifacts. All DEB artifacts are now produced without any
`os`/`debug`/`source` subdirectory.

Related to #2147.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc03fcb7b993f14eca74ff2a20f253322743774d..90ac06b2cd8745a68e3d9461175eb300fa9c25e9 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,7 +69,7 @@ portable-source:
         expire_in: 1 week
         paths:
             - Packages/*/*/*.tar.xz
-            - Packages/*/*/*/*deb
+            - Packages/*/*/*deb
             - Metadata/*/*/configure.log
             - GRAPHVIZ_VERSION
         reports:
@@ -651,7 +651,7 @@ ubuntu21-04-cmake-ASan-build-for-ctest:
             # the dot program is needed to configure the plugins before running pre-install tests
             - build/cmd/dot/dot
             # the packages need to be installed for the post-install tests
-            - Packages/*/*/*/*deb
+            - Packages/*/*/*deb
         reports:
             metrics: metrics.txt
     tags:
@@ -694,7 +694,7 @@ ubuntu21-10-cmake-ASan-build-for-ctest:
             # the dot program is needed to configure the plugins before running pre-install tests
             - build/cmd/dot/dot
             # the packages need to be installed for the post-install tests
-            - Packages/*/*/*/*deb
+            - Packages/*/*/*deb
         reports:
             metrics: metrics.txt
     tags:

diff --git a/ci/build.sh b/ci/build.sh
index 711637a45b3dbdb2d209d395a838b2b87e674145..7c4f3b0afa66b44220f07677db6688b875e97431 100755 (executable)
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -33,10 +33,10 @@ if [ "${build_system}" = "cmake" ]; then
     cpack
     popd
     if [ "${OSTYPE}" = "linux-gnu" ]; then
+        GV_VERSION=$(python3 gen_version.py)
         if [ "${ID_LIKE:-}" = "debian" ]; then
-            mv build/*.deb ${DIR}/os/
+            mv build/Graphviz-${GV_VERSION}-Linux.deb ${DIR}/graphviz-${GV_VERSION}-cmake.deb
         else
-            GV_VERSION=$(python3 gen_version.py)
             mv build/Graphviz-${GV_VERSION}-Linux.rpm ${DIR}/graphviz-${GV_VERSION}-cmake.rpm
         fi
     elif [[ "${OSTYPE}" =~ "darwin" ]]; then

diff --git a/ci/install-packages.sh b/ci/install-packages.sh
index 82369ace8b30c45d1689b8ab2fab086d8ceddd5a..b28b77e4c83db39e8be532a98996c9ad4a928f6f 100755 (executable)
--- a/ci/install-packages.sh
+++ b/ci/install-packages.sh
@@ -32,7 +32,7 @@ if [ "${ID}" = "centos" -o "${ID}" = "fedora" ]; then
 fi
 if [ "${build_system}" = "cmake" ]; then
     if [ "${ID_LIKE}" = "debian" ]; then
-        apt install ./${DIR}/os/Graphviz-${GV_VERSION}-Linux.deb
+        apt install ./${DIR}/graphviz-${GV_VERSION}-cmake.deb
     elif [ "${ID}" = "Darwin" ]; then
         unzip ${DIR}/os/Graphviz-${GV_VERSION}-Darwin.zip
         cp -rp Graphviz-${GV_VERSION}-Darwin/* /usr/local