also build a .tar.xz archive for distribution

Closes #454.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dffcf73855a06c58d4cfa0ae198bd16217e699b3..aed12cd968bf2204895443b636a480d12574b3a6 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,7 @@ portable-source:
         - ./autogen.sh
         - ./configure --enable-man-pdfs
         - make dist
+        - make dist-xz
     artifacts:
         when: on_success
         expire_in: 1 week
@@ -21,6 +22,7 @@ portable-source:
             - DATE
             - COLLECTION
             - graphviz-*.tar.gz
+            - graphviz-*.tar.xz
     except:
         - tags
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8ccce0e4c7403d0dde0564252ad4f20f183fc6a..fd0307eb948342cbbded5e1f034377c6c796e224 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Support for building against Guile 2.2
+- Portable source is now also offered as a .tar.xz
 
 ### Changed
 - CentOS/RHEL 6 is no longer supported
@@ -25,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix bad free in lefty !1709
 - typo in pathcross #1926
 - Out-of-bounds write caused by incorrect error handling of malloc in genUserdata #1928
+- Offer .tar.xz files too #454
 
 ## [2.46.0] - 2021-01-18
 

diff --git a/ci/deploy.py b/ci/deploy.py
index ac8fb138ba6e7e007f341c491fd3b22711d03df0..5887eca9213aee68348e155b9d456152f0b55fa5 100644 (file)
--- a/ci/deploy.py
+++ b/ci/deploy.py
@@ -118,23 +118,25 @@ def main(args: [str]) -> int:
   if options.version is None:
     options.version = gv_version
 
-  tarball = f'graphviz-{gv_version}.tar.gz'
-  if not os.path.exists(tarball):
-    log.error(f'source {tarball} not found')
-    return -1
-
-  # generate a checksum for the source tarball
-  log.info(f'MD5 summing {tarball}')
-  checksum = f'{tarball}.md5'
-  with open(checksum, 'wt') as f:
-    with open(tarball, 'rb') as data:
-      f.write(f'{hashlib.md5(data.read()).hexdigest()}  {tarball}\n')
-
   # list of assets we have uploaded
   assets: [str] = []
 
-  assets.append(upload(package_version, tarball))
-  assets.append(upload(package_version, checksum))
+  for tarball in (f'graphviz-{gv_version}.tar.gz',
+                  f'graphviz-{gv_version}.tar.xz'):
+
+    if not os.path.exists(tarball):
+      log.error(f'source {tarball} not found')
+      return -1
+
+    # generate a checksum for the source tarball
+    log.info(f'MD5 summing {tarball}')
+    checksum = f'{tarball}.md5'
+    with open(checksum, 'wt') as f:
+      with open(tarball, 'rb') as data:
+        f.write(f'{hashlib.md5(data.read()).hexdigest()}  {tarball}\n')
+
+    assets.append(upload(package_version, tarball))
+    assets.append(upload(package_version, checksum))
 
   for stem, _, leaves in os.walk('Packages'):
     for leaf in leaves: