From 07ba0cb84a889684cec1bc8a8bdf81fb0acb5682 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 14 Feb 2020 22:00:00 +0800
Subject: [PATCH] make_tarball: use XZ for compression

Closes #5460.
---
 CHANGELOG.md                |  1 +
 build_tools/make_tarball.sh | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6f185c59..c119c2cce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 ### Deprecations and removed features
 
 ### For distributors and developers
+- fish source tarballs are now distributed using the XZ compression method (#5460).
 
 ---
 
diff --git a/build_tools/make_tarball.sh b/build_tools/make_tarball.sh
index ffe12a930..663078e06 100755
--- a/build_tools/make_tarball.sh
+++ b/build_tools/make_tarball.sh
@@ -42,7 +42,7 @@ prefix="fish-$VERSION"
 path=${FISH_ARTEFACT_PATH:-~/fish_built}/$prefix.tar
 
 # Clean up stuff we've written before
-rm -f "$path" "$path".gz
+rm -f "$path" "$path".xz
 
 # git starts the archive
 git archive --format=tar --prefix="$prefix"/ HEAD > "$path"
@@ -63,9 +63,9 @@ $TAR_APPEND version
 cd -
 rm -r "$PREFIX_TMPDIR"
 
-# gzip it
-gzip "$path"
+# xz it
+xz "$path"
 
 # Output what we did, and the sha1 hash
-echo "Tarball written to $path".gz
-openssl dgst -sha256 "$path".gz
+echo "Tarball written to $path".xz
+openssl dgst -sha256 "$path".xz