Skip to content

Commit 335fb1a

Browse files
committed
Update mingw-w64 + GNU toolchain
1 parent 398fd92 commit 335fb1a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/ci/scripts/install-mingw.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ IFS=$'\n\t'
99

1010
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
1111

12-
MINGW_ARCHIVE_32="i686-12.2.0-release-posix-dwarf-rt_v10-rev0.7z"
13-
MINGW_ARCHIVE_64="x86_64-12.2.0-release-posix-seh-rt_v10-rev0.7z"
12+
MINGW_ARCHIVE_32="i686-w64-mingw32.tar.zst"
13+
MINGW_ARCHIVE_64="x86_64-w64-mingw32.tar.zst"
1414

1515
if isWindows; then
1616
case "${CI_JOB_NAME}" in
@@ -41,13 +41,13 @@ if isWindows; then
4141
if [[ "${CUSTOM_MINGW-0}" -ne 1 ]]; then
4242
pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \
4343
mingw-w64-$arch-gcc \
44-
mingw-w64-$arch-python # the python package is actually for python3
44+
mingw-w64-$arch-python \ # the python package is actually for python3
45+
tar zstd
4546
ciCommandAddPath "$(ciCheckoutPath)/msys2/mingw${bits}/bin"
4647
else
47-
mingw_dir="mingw${bits}"
48-
49-
curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
50-
7z x -y mingw.7z > /dev/null
51-
ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
48+
curl -o mingw.tar.zst "https://github.com/mati865/mingw-build/releases/download/v0/${mingw_archive}"
49+
tar -xf mingw.tar.zst > /dev/null
50+
ciCommandAddPath "$(pwd)/${arch}-w64-mingw32/bin"
51+
ciCommandAddPath "$(pwd)/${arch}-w64-mingw32/${arch}-w64-mingw32/bin"
5252
fi
5353
fi

0 commit comments

Comments
 (0)