ci: Add tar.gz archives for Linux binary releases

diff --git a/ci/generate-release-notes b/ci/generate-release-notes
index 827c0efc1ef3e6177347032eb4c45798688a478d..a9d5ecaf2f996be7248463510eee5f237b27dc8c 100755 (executable)
--- a/ci/generate-release-notes
+++ b/ci/generate-release-notes
@@ -7,6 +7,8 @@ u_version=$(echo "${version}" | sed 's/\./_/g')
 url_prefix="https://github.com/ccache/ccache/releases/download/v${version}"
 
 source_extensions=(tar.gz tar.xz)
+linux_bin_extensions=(tar.gz tar.xz)
+
 linux_archs=(aarch64 x86_64)
 # windows_archs=(aarch64 i686 x86_64)
 windows_archs=(aarch64 x86_64)
@@ -35,8 +37,10 @@ for ext in "${source_extensions[@]}"; do
 done
 add "Darwin (macOS) universal binary release" "ccache-${version}-darwin.tar.gz"
 for arch in "${linux_archs[@]}"; do
-    add "Linux ${arch} binary release (glibc)" "ccache-${version}-linux-${arch}-glibc.tar.xz"
-    add "Linux ${arch} binary release (musl static)" "ccache-${version}-linux-${arch}-musl-static.tar.xz"
+    for ext in "${linux_bin_extensions[@]}"; do
+        add "Linux ${arch} binary release (glibc)" "ccache-${version}-linux-${arch}-glibc.${ext}"
+        add "Linux ${arch} binary release (musl static)" "ccache-${version}-linux-${arch}-musl-static.${ext}"
+    done
 done
 for arch in "${windows_archs[@]}"; do
     add "Windows ${arch} binary release" "ccache-${version}-windows-${arch}.zip"

diff --git a/ci/prepare-release b/ci/prepare-release
index 43a939207faf1f5cf9c7150fa45f689bb853bda1..2984bbcd69b3570d5c8ec1b1bb7ee1caf2171f5a 100755 (executable)
--- a/ci/prepare-release
+++ b/ci/prepare-release
@@ -24,7 +24,6 @@ prepare_source_release() {
 
 prepare_posix_binary_release() {
     local arch=$1
-    local compression=$2
 
     local name="ccache-${VERSION}-${arch}"
     mkdir "${name}"
@@ -35,17 +34,18 @@ prepare_posix_binary_release() {
     cp GPL-3.0.txt README.md "${name}"
     cp docs/install/usr/local/share/doc/ccache/* "${name}"
     cp docs/install/usr/local/share/man/man1/ccache.1 "${name}"
-    tar -caf "release/${name}.tar.${compression}" "${name}"
+    for ext in gz xz; do
+        tar -caf "release/${name}.tar.${ext}" "${name}"
+    done
 }
 
 test_posix_binary_release() {
     local arch=$1
-    local compression=$2
 
     local name="ccache-${VERSION}-${arch}"
 
     tmpdir=$(mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXX")
-    tar -C "${tmpdir}" -xf "${PWD}/release/${name}.tar.${compression}"
+    tar -C "${tmpdir}" -xf "${PWD}/release/${name}.tar.xz"
     (
         cd "${tmpdir}/${name}"
         make install prefix=/foo/bar DESTDIR=destdir
@@ -68,17 +68,16 @@ mkdir release
 
 prepare_source_release
 
-prepare_posix_binary_release darwin gz
-prepare_posix_binary_release linux-aarch64-glibc xz
-prepare_posix_binary_release linux-aarch64-musl-static xz
-prepare_posix_binary_release linux-x86_64-glibc xz
-prepare_posix_binary_release linux-x86_64-musl-static xz
+prepare_posix_binary_release linux-aarch64-glibc
+prepare_posix_binary_release linux-aarch64-musl-static
+prepare_posix_binary_release linux-x86_64-glibc
+prepare_posix_binary_release linux-x86_64-musl-static
 
 prepare_windows_binary_release windows-aarch64
 # prepare_windows_binary_release windows-i686
 prepare_windows_binary_release windows-x86_64
 
-test_posix_binary_release linux-x86_64-glibc xz
-test_posix_binary_release linux-x86_64-musl-static xz
+test_posix_binary_release linux-x86_64-glibc
+test_posix_binary_release linux-x86_64-musl-static
 
 ls -l . release