Merge remote-tracking branch 'upstream/main'

jeremyd2019 · Oct 26, 2023 · c9ae8c0 · c9ae8c0
2 parents 6e515be + a3839b2
commit c9ae8c0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -49,6 +49,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-*.packages.txt msys2-base-x86_64-latest.packages.txt
           sha256sum.exe msys2-*
           sha256sum.exe msys2-* > msys2-checksums.txt
 

diff --git a/create-sfx.sh b/create-sfx.sh
@@ -4,26 +4,26 @@
 set -e
 
 # Download and extract https://github.com/mcmilk/7-Zip-zstd
-NAME="7z21.03-zstd-x64"
-CHECKSUM="531b20dfb03d8f30f61ae56a181610bbb6f3cf7cc71dac1d8f95511289de76f3"
+NAME="7z22.01-zstd-x64"
+CHECKSUM="d542d78397bbed8e77c221f36cad461a0d83f1263b993a7048e81df40f403fb8"
 DIR="$( cd "$( dirname "$0" )" && pwd )"
 mkdir -p "$DIR/_cache"
 BASE="$DIR/_cache/$NAME"
 if [ ! -f "$BASE.exe" ]; then
-    curl --fail -L "https://github.com/mcmilk/7-Zip-zstd/releases/download/v21.03-v1.5.0-R2/$NAME.exe" -o "$BASE.exe"
+    curl --fail -L "https://github.com/mcmilk/7-Zip-zstd/releases/download/v22.01-v1.5.5-R3/$NAME.exe" -o "$BASE.exe"
 fi
 echo "$CHECKSUM $BASE.exe" | sha256sum --quiet --check
 if [ ! -d "$BASE" ]; then
     7z e -o"$BASE" "$DIR/_cache/$NAME.exe"
 fi
 
-NAME="7z21.03-zstd-x32"
-CHECKSUM="79382f65a6903726157b385ae5e2baae7c9ca39eb157f1d08040ee112e99d8f1"
+NAME="7z22.01-zstd-x32"
+CHECKSUM="cc1b8c360656df516684c61da2b23e2185e27c23d255fd3db6a792373dcc1ba3"
 DIR="$( cd "$( dirname "$0" )" && pwd )"
 mkdir -p "$DIR/_cache"
 BASE32="$DIR/_cache/$NAME"
 if [ ! -f "$BASE32.exe" ]; then
-    curl --fail -L "https://github.com/mcmilk/7-Zip-zstd/releases/download/v21.03-v1.5.0-R2/$NAME.exe" -o "$BASE32.exe"
+    curl --fail -L "https://github.com/mcmilk/7-Zip-zstd/releases/download/v22.01-v1.5.5-R3/$NAME.exe" -o "$BASE32.exe"
 fi
 echo "$CHECKSUM $BASE32.exe" | sha256sum --quiet --check
 if [ ! -d "$BASE32" ]; then

diff --git a/make-msys2-installer b/make-msys2-installer
@@ -80,6 +80,7 @@ create_chroot_system() {
     pacman -S filesystem msys2-runtime-3.3 --noconfirm --root "${_newmsys}"
     pacman -S base --noconfirm --root "${_newmsys}"
     grep -F '[build32]' etc/pacman.conf || sed -i '/\[msys\]/i [build32]\nServer = https://github.com/jeremyd2019/msys2-build32/releases/download/repo\nSigLevel = Optional\n' etc/pacman.conf
+    pacman -Q --root "${_newmsys}" > "${_thisdir}/msys2-base-${_arch}-${_date}.packages.txt"
   popd > /dev/null
 }