diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3816c1a52..cfe3e2d57 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -588,7 +588,7 @@ jobs: path: | ~/.cache/droiddeck-pack-inputs ~/.cache/droiddeck-build - key: pack-inputs-v2-${{ hashFiles('tools/packs/build.sh', 'tools/packs/fetch-verified.sh', 'tools/packs/tracking/release.env', 'tools/powervr/release.json') }} + key: pack-inputs-v2-${{ hashFiles('tools/packs/build.sh', 'tools/packs/fetch-verified.sh', 'tools/packs/tracking/release.env', 'tools/packs/zstd/release.env', 'tools/powervr/release.json') }} restore-keys: pack-inputs-v2- - name: Build the add-on packs run: | diff --git a/tools/packs/build.sh b/tools/packs/build.sh index 2b34c7fc6..b2a99c611 100755 --- a/tools/packs/build.sh +++ b/tools/packs/build.sh @@ -11,6 +11,8 @@ linuxfs="$repo/app/src/main/assets/linuxfs/usr/local/lib" source "$here/tracking/release.env" # shellcheck source=butler/release.env source "$here/butler/release.env" +# shellcheck source=zstd/release.env +source "$here/zstd/release.env" work=$(mktemp -d) trap 'rm -rf "$work"' EXIT @@ -21,6 +23,22 @@ fetch() { bash "$here/fetch-verified.sh" "$@" } +zstd_version() { "$1" -V 2>/dev/null | sed -n 's/.* v\([0-9][0-9.]*\),.*/\1/p'; } +zstd=$(command -v zstd || true) +if [ -z "$zstd" ] || [ "$(zstd_version "$zstd")" != "$ZSTD_VERSION" ]; then + zstd="${DROIDDECK_PACK_CACHE:-"$HOME/.cache/droiddeck-pack-inputs"}/zstd-$ZSTD_VERSION/zstd" + if [ ! -x "$zstd" ] || [ "$(zstd_version "$zstd")" != "$ZSTD_VERSION" ]; then + fetch "https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-$ZSTD_VERSION.tar.gz" \ + "$ZSTD_SHA256" "$work/zstd.tar.gz" + tar -xzf "$work/zstd.tar.gz" -C "$work" + make -s -C "$work/zstd-$ZSTD_VERSION" -j"$(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 2)" zstd-release >/dev/null + mkdir -p "$(dirname "$zstd")" + install -m755 "$work/zstd-$ZSTD_VERSION/programs/zstd" "$zstd.part.$$" + mv -f "$zstd.part.$$" "$zstd" + fi +fi +[ "$(zstd_version "$zstd")" = "$ZSTD_VERSION" ] || { echo "packs need zstd $ZSTD_VERSION, $zstd is not it" >&2; exit 1; } + pack() { local name=$1 src=$2 shift 2 @@ -47,7 +65,7 @@ with tarfile.open(dest, "w", format=tarfile.USTAR_FORMAT) as tar: with open(path, "rb") as f: tar.addfile(info, f) EOF - zstd -q -19 -f "$work/$name.tar" -o "$out/$name.tar.zst" + "$zstd" -q -19 -f "$work/$name.tar" -o "$out/$name.tar.zst" echo "$name $(sha256 "$out/$name.tar.zst") $(wc -c < "$out/$name.tar.zst" | tr -d ' ')" } diff --git a/tools/packs/zstd/release.env b/tools/packs/zstd/release.env new file mode 100644 index 000000000..4f69b092b --- /dev/null +++ b/tools/packs/zstd/release.env @@ -0,0 +1,2 @@ +ZSTD_VERSION=1.5.5 +ZSTD_SHA256=9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4