Leave tarballs as-is, remove Brotli, don't re-gzip (#199)

These files will no longer be downloaded millions of times,
so there is no need to spend CPU time maximising compression.

.circleci/config.yml

@@ -23,4 +23,4 @@ jobs:
       - when:
           condition: <<pipeline.git.tag>>
           steps:
-            - run: gh release upload --repo lovell/sharp-libvips $CIRCLE_TAG *.tar.gz *.tar.br *.integrity
+            - run: gh release upload --repo lovell/sharp-libvips $CIRCLE_TAG *.tar.gz *.integrity

.github/workflows/build-release.yml

@@ -43,7 +43,7 @@ jobs:
         if: runner.os == 'macOS'
         run: |
           pip3 install meson ninja
-          brew install advancecomp automake brotli nasm pkg-config
+          brew install automake nasm pkg-config
       - name: Build ${{ matrix.platform }}
         id: build-release
         run: ./build.sh $(cat LIBVIPS_VERSION) ${{ matrix.platform }}
@@ -63,19 +63,6 @@ jobs:
           omitNameDuringUpdate: true
           prerelease: true
           token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Upload Release Asset (.tar.br)
-        id: upload-release-asset-br
-        if: startsWith(github.ref, 'refs/tags/v')
-        uses: ncipollo/release-action@v1
-        with:
-          allowUpdates: true
-          artifacts: libvips-*-${{ matrix.platform }}.tar.br
-          artifactContentType: application/x-brotli
-          artifactErrorsFailBuild: true
-          omitBodyDuringUpdate: true
-          omitNameDuringUpdate: true
-          prerelease: true
-          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload Release Asset (.integrity)
         id: upload-release-asset-integrity
         if: startsWith(github.ref, 'refs/tags/v')

build/lin.sh

@@ -566,11 +566,5 @@ tar chzf ${PACKAGE}/libvips-${VERSION_VIPS}-${PLATFORM}.tar.gz \
   *.json \
   THIRD-PARTY-NOTICES.md
 
-# Recompress using AdvanceCOMP, ~5% smaller
-advdef --recompress --shrink-insane ${PACKAGE}/libvips-${VERSION_VIPS}-${PLATFORM}.tar.gz
-
-# Recompress using Brotli, ~15% smaller
-gunzip -c ${PACKAGE}/libvips-${VERSION_VIPS}-${PLATFORM}.tar.gz | brotli -o ${PACKAGE}/libvips-${VERSION_VIPS}-${PLATFORM}.tar.br
-
 # Allow tarballs to be read outside container
 chmod 644 ${PACKAGE}/libvips-${VERSION_VIPS}-${PLATFORM}.tar.*

build/win.sh

@@ -48,12 +48,6 @@ tar czf /packaging/libvips-${VERSION_VIPS}-${PLATFORM}.tar.gz \
   *.json \
   THIRD-PARTY-NOTICES.md
 
-# Recompress using AdvanceCOMP, ~5% smaller
-advdef --recompress --shrink-insane /packaging/libvips-${VERSION_VIPS}-${PLATFORM}.tar.gz
-
-# Recompress using Brotli, ~15% smaller
-gunzip -c /packaging/libvips-${VERSION_VIPS}-${PLATFORM}.tar.gz | brotli -o /packaging/libvips-${VERSION_VIPS}-${PLATFORM}.tar.br
-
 # Allow tarballs to be read outside container
 chmod 644 /packaging/libvips-${VERSION_VIPS}-${PLATFORM}.tar.*
 

integrity.sh

@@ -8,6 +8,6 @@ integrity() {
   printf "$CHECKSUM" > $1.integrity
 }
 
-for tarball in *.tar.{br,gz}; do
+for tarball in *.tar.gz; do
   integrity $tarball
 done

platforms/linux-arm64v8/Dockerfile

@@ -15,10 +15,8 @@ RUN \
   amazon-linux-extras install epel -y && \
   yum install -y --setopt=tsflags=nodocs \
     --exclude=gcc \
-    advancecomp \
     autoconf \
     automake \
-    brotli \
     bzip2 \
     cmake3 \
     curl \

platforms/linux-armv6/Dockerfile

@@ -16,10 +16,8 @@ RUN \
   dpkg --add-architecture armhf && \
   apt-get update && \
   apt-get install -y \
-    advancecomp \
     autoconf \
     autopoint \
-    brotli \
     cmake \
     gettext \
     git \

platforms/linux-armv7/Dockerfile

@@ -16,10 +16,8 @@ RUN \
   dpkg --add-architecture armhf && \
   apt-get update && \
   apt-get install -y \
-    advancecomp \
     autoconf \
     autopoint \
-    brotli \
     cmake \
     crossbuild-essential-armhf \
     gettext \

platforms/linux-s390x/Dockerfile

@@ -16,10 +16,8 @@ RUN \
   dpkg --add-architecture s390x && \
   apt-get update && \
   apt-get install -y \
-    advancecomp \
     autoconf \
     autopoint \
-    brotli \
     cmake \
     crossbuild-essential-s390x \
     gettext \

platforms/linux-x64/Dockerfile

@@ -15,10 +15,8 @@ RUN \
   amazon-linux-extras install epel -y && \
   yum install -y --setopt=tsflags=nodocs \
     --exclude=gcc \
-    advancecomp \
     autoconf \
     automake \
-    brotli \
     bzip2 \
     cmake3 \
     curl \

platforms/linuxmusl-arm64v8/Dockerfile

@@ -16,7 +16,6 @@ RUN \
     autoconf \
     automake \
     binutils \
-    brotli \
     build-base \
     cmake \
     coreutils \
@@ -32,7 +31,6 @@ RUN \
     py3-pip \
     python3 \
     && \
-  apk --update --no-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.17/community/ add advancecomp && \
   curl -Ls https://github.com/lovell/aarch64-linux-musl-crosstools/archive/main.tar.gz | tar -hxzC / --strip-components=2 && \
   ln -s /usr/bin/pkg-config /bin/aarch64-linux-musl-pkg-config && \
   curl https://sh.rustup.rs -sSf | sh -s -- -y \

platforms/linuxmusl-x64/Dockerfile

@@ -16,7 +16,6 @@ RUN \
     autoconf \
     automake \
     binutils \
-    brotli \
     build-base \
     cmake \
     coreutils \
@@ -33,7 +32,6 @@ RUN \
     py3-pip \
     python3 \
     && \
-  apk --update --no-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.17/community/ add advancecomp && \
   curl https://sh.rustup.rs -sSf | sh -s -- -y \
     --no-modify-path \
     --profile minimal \

platforms/win32/Dockerfile

@@ -3,4 +3,4 @@ LABEL maintainer="Lovell Fuller <[email protected]>"
 
 # Create Debian-based container suitable for post-processing Windows binaries
 
-RUN apt-get update && apt-get install -y advancecomp brotli curl zip
+RUN apt-get update && apt-get install -y curl zip