Skip to content

Commit 8de1983

Browse files
committed
Don't attempt to install i686 7zip.
That package seems to be gone now.
1 parent ff369c2 commit 8de1983

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

.github/workflows/build32.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: jeremyd2019/setup-msys2@v2_build32
1818
with:
1919
msystem: MINGW32
20-
install: tar mingw-w64-i686-7zip mingw-w64-x86_64-7zip mingw-w64-x86_64-zstd
20+
install: tar mingw-w64-x86_64-7zip mingw-w64-i686-xz mingw-w64-x86_64-zstd
2121
update: true
2222
bitness: 32
2323

create-sfx.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if [ ! -f "$BASE.exe" ]; then
1414
fi
1515
echo "$CHECKSUM $BASE.exe" | sha256sum --quiet --check
1616
if [ ! -d "$BASE" ]; then
17-
7z e -o"$BASE" "$DIR/_cache/$NAME.exe"
17+
/mingw64/bin/7z e -o"$BASE" "$DIR/_cache/$NAME.exe"
1818
fi
1919

2020
NAME="7z22.01-zstd-x32"
@@ -27,7 +27,7 @@ if [ ! -f "$BASE32.exe" ]; then
2727
fi
2828
echo "$CHECKSUM $BASE32.exe" | sha256sum --quiet --check
2929
if [ ! -d "$BASE32" ]; then
30-
7z e -o"$BASE32" "$DIR/_cache/$NAME.exe"
30+
/mingw64/bin/7z e -o"$BASE32" "$DIR/_cache/$NAME.exe"
3131
fi
3232

3333
# Creat SFX installer

make-msys2-installer

-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ create_chroot_system() {
9494

9595
main() {
9696
pacman -S --noconfirm --needed \
97-
"${MINGW_PACKAGE_PREFIX}-7zip" \
9897
"${MINGW_PACKAGE_PREFIX}-xz" \
9998
"${MINGW_PACKAGE_PREFIX}-zstd" \
10099
"tar"

0 commit comments

Comments
 (0)