Don't attempt to install i686 7zip.

That package seems to be gone now.
jeremyd2019 · Jul 29, 2024 · 8de1983 · 8de1983
1 parent ff369c2
commit 8de1983
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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 mingw-w64-x86_64-zstd
+          install: tar mingw-w64-x86_64-7zip mingw-w64-i686-xz mingw-w64-x86_64-zstd
           update: true
           bitness: 32
 

diff --git a/create-sfx.sh b/create-sfx.sh
@@ -14,7 +14,7 @@ if [ ! -f "$BASE.exe" ]; then
 fi
 echo "$CHECKSUM $BASE.exe" | sha256sum --quiet --check
 if [ ! -d "$BASE" ]; then
-    7z e -o"$BASE" "$DIR/_cache/$NAME.exe"
+    /mingw64/bin/7z e -o"$BASE" "$DIR/_cache/$NAME.exe"
 fi
 
 NAME="7z22.01-zstd-x32"
@@ -27,7 +27,7 @@ if [ ! -f "$BASE32.exe" ]; then
 fi
 echo "$CHECKSUM $BASE32.exe" | sha256sum --quiet --check
 if [ ! -d "$BASE32" ]; then
-    7z e -o"$BASE32" "$DIR/_cache/$NAME.exe"
+    /mingw64/bin/7z e -o"$BASE32" "$DIR/_cache/$NAME.exe"
 fi
 
 # Creat SFX installer

diff --git a/make-msys2-installer b/make-msys2-installer
@@ -94,7 +94,6 @@ create_chroot_system() {
 
 main() {
   pacman -S --noconfirm --needed \
-    "${MINGW_PACKAGE_PREFIX}-7zip" \
     "${MINGW_PACKAGE_PREFIX}-xz" \
     "${MINGW_PACKAGE_PREFIX}-zstd" \
     "tar"