From ff369c2c1d73dd87b03afeea4a74a2c7a6d569c6 Mon Sep 17 00:00:00 2001 From: Jeremy Drake Date: Tue, 7 May 2024 10:51:08 -0700 Subject: [PATCH] use mingw64 zstd to compress to avoid OOM errors on 32-bit --- .github/workflows/build32.yml | 2 +- make-msys2-installer | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build32.yml b/.github/workflows/build32.yml index bb49aa4..6e482e4 100644 --- a/.github/workflows/build32.yml +++ b/.github/workflows/build32.yml @@ -17,7 +17,7 @@ jobs: - uses: jeremyd2019/setup-msys2@v2_build32 with: msystem: MINGW32 - install: tar mingw-w64-i686-7zip mingw-w64-x86_64-7zip + install: tar mingw-w64-i686-7zip mingw-w64-x86_64-7zip mingw-w64-x86_64-zstd update: true bitness: 32 diff --git a/make-msys2-installer b/make-msys2-installer index 0b600ff..fe79faa 100644 --- a/make-msys2-installer +++ b/make-msys2-installer @@ -38,7 +38,7 @@ create_archives() { xz --test "${_thisdir}/msys2-base-${_arch}-${_date}.tar.xz" echo "[Creating zstd archive...]" - zstd -T1 -22 --ultra --force "${_thisdir}/msys2-base-${_arch}-${_date}.tar" -o "${_thisdir}/msys2-base-${_arch}-${_date}.tar.zst" + /mingw64/bin/zstd -T0 -22 --ultra --force "${_thisdir}/msys2-base-${_arch}-${_date}.tar" -o "${_thisdir}/msys2-base-${_arch}-${_date}.tar.zst" zstd --test "${_thisdir}/msys2-base-${_arch}-${_date}.tar.zst" rm "${_thisdir}/msys2-base-${_arch}-${_date}.tar"