From 3b935b9f61903ad4c7b24704cb0bd489ad983703 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 20 Jan 2024 13:24:38 +0100 Subject: [PATCH 1/4] Revert "Downgrade GH actions" This reverts commit 4d83cc210cea61697847b2ce564fb2fb8643be50. --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1cf8f92..a079415 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,7 +54,7 @@ jobs: sha256sum.exe msys2-* > msys2-checksums.txt - name: Upload Results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: installer path: msys2-* @@ -71,7 +71,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: installer @@ -107,7 +107,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: installer @@ -140,7 +140,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: installer @@ -174,7 +174,7 @@ jobs: if: github.ref == 'refs/heads/main' runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: installer From 759168a89b342a2175cd3523771c0f8c5dcf33f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Tue, 20 Feb 2024 19:58:09 +0100 Subject: [PATCH 2/4] generate installer on UCRT64 environment --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a079415..86a9ba4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,12 +19,13 @@ jobs: - name: setup-msys2 uses: msys2/setup-msys2@v2 with: - msystem: MINGW64 + msystem: UCRT64 update: true install: >- tar - mingw-w64-x86_64-qt-installer-framework - mingw-w64-x86_64-7zip + pacboy: >- + qt-installer-framework:p + 7zip:p - name: Switch to the main mirror shell: msys2 {0} From 97d7bf58b4ffbab097b20940475afc3484723208 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 22 Feb 2024 21:51:26 +0100 Subject: [PATCH 3/4] Switch to CLANG64 instead installerbase.exe is a bit smaller there --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 86a9ba4..292eb0b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - name: setup-msys2 uses: msys2/setup-msys2@v2 with: - msystem: UCRT64 + msystem: CLANG64 update: true install: >- tar From 477a2f56032c967e67dbc3e9f043d0399ffa99b0 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 5 Apr 2024 11:35:52 +0200 Subject: [PATCH 4/4] Provide a .tar.zst in addition to the .tar.xz So people can stop using xz if they want. --- .github/workflows/build.yml | 1 + .gitignore | 1 + make-msys2-installer | 22 ++++++++++++++++------ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 292eb0b..1d2ca9c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,6 +50,7 @@ jobs: mv msys2-base-x86_64-[0-9]*.sfx.exe msys2-base-x86_64-latest.sfx.exe mv msys2-x86_64-[0-9]*.exe msys2-x86_64-latest.exe mv msys2-*.tar.xz msys2-base-x86_64-latest.tar.xz + mv msys2-*.tar.zst msys2-base-x86_64-latest.tar.zst mv msys2-*.packages.txt msys2-base-x86_64-latest.packages.txt sha256sum.exe msys2-* sha256sum.exe msys2-* > msys2-checksums.txt diff --git a/.gitignore b/.gitignore index 66d4f3d..bd695b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ _cache *.exe *.xz +*.zst _build \ No newline at end of file diff --git a/make-msys2-installer b/make-msys2-installer index 9b39043..83f32e4 100644 --- a/make-msys2-installer +++ b/make-msys2-installer @@ -21,13 +21,21 @@ create_installer_archive() { popd > /dev/null } -create_archive() { - echo "[Creating archive...]" - +create_archives() { + echo "[Creating tarball...]" pushd "${_newmsysbase}" > /dev/null - export XZ_OPT="-9T0" - /usr/bin/tar --transform='s/:/_/g' --dereference --hard-dereference -cJf "${_thisdir}/msys2-base-x86_64-${_date}.tar.xz" msys64 + /usr/bin/tar --transform='s/:/_/g' --dereference --hard-dereference -cf "${_thisdir}/msys2-base-x86_64-${_date}.tar" msys64 popd > /dev/null + + echo "[Creating xz archive...]" + xz -9 --keep --verbose --force --compress --threads=0 "${_thisdir}/msys2-base-x86_64-${_date}.tar" + xz --test "${_thisdir}/msys2-base-x86_64-${_date}.tar.xz" + + echo "[Creating zstd archive...]" + zstd -T0 -22 --ultra --force "${_thisdir}/msys2-base-x86_64-${_date}.tar" -o "${_thisdir}/msys2-base-x86_64-${_date}.tar.zst" + zstd --test "${_thisdir}/msys2-base-x86_64-${_date}.tar.zst" + + rm "${_thisdir}/msys2-base-x86_64-${_date}.tar" } create_sfx() { @@ -80,6 +88,8 @@ main() { pacman -S --noconfirm --needed \ "${MINGW_PACKAGE_PREFIX}-qt-installer-framework" \ "${MINGW_PACKAGE_PREFIX}-7zip" \ + "${MINGW_PACKAGE_PREFIX}-xz" \ + "${MINGW_PACKAGE_PREFIX}-zstd" \ "tar" create_chroot_system @@ -88,7 +98,7 @@ main() { create_installer_archive create_installer - create_archive + create_archives create_sfx }