From 40df595d58e3a43ed3df9ef297a05cee388e16b4 Mon Sep 17 00:00:00 2001 From: "Philip H." <47042125+pheiduck@users.noreply.github.com> Date: Mon, 26 Oct 2026 10:52:04 +0000 Subject: [PATCH] CI: drop 32-bit MinGW toolchain matrix entries MSYS2 no longer ships 32-bit (i686) mingw-w64 packages, including mingw-w64-i686-make, so `pacboy -S make:p gcc:p` fails once MSYSTEM resolves to MINGW32: error: target not found: mingw-w64-i686-make Upstream has been dropping i686 mingw-w64 packages since the 2023-12-13 "starting to drop some 32-bit packages" announcement, and the community-maintained 32-bit fallback repo stopped updating in November 2025, so there's no maintained path to keep this working. Move the two mingw+x86 matrix entries to x64. 32-bit coverage is still provided by the existing MSVC x86 entries; only the MinGW-on-x86 combination is removed. related: #21639 Signed-off-by: Philip H. <47042125+pheiduck@users.noreply.github.com> Signed-off-by: Christian Brabandt --- .github/workflows/ci-windows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index 52ec391fa0..57c912aaee 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -60,14 +60,14 @@ jobs: matrix: include: - { features: HUGE, toolchain: msvc, VIMDLL: no, GUI: no, arch: x64, python3: stable } - - { features: HUGE, toolchain: mingw, VIMDLL: yes, GUI: yes, arch: x86, python3: stable, coverage: yes } + - { features: HUGE, toolchain: mingw, VIMDLL: yes, GUI: yes, arch: x64, python3: stable, coverage: yes } - { features: HUGE, toolchain: msvc, VIMDLL: no, GUI: yes, arch: x86 } - { features: HUGE, toolchain: mingw, VIMDLL: yes, GUI: no, arch: x64, coverage: yes } - { features: HUGE, toolchain: msvc, VIMDLL: no, GUI: no, arch: x64, ttytype: conpty } - { features: NORMAL, toolchain: msvc, VIMDLL: yes, GUI: no, arch: x86 } - { features: NORMAL, toolchain: mingw, VIMDLL: no, GUI: yes, arch: x64 } - { features: TINY, toolchain: msvc, VIMDLL: yes, GUI: yes, arch: x64 } - - { features: TINY, toolchain: mingw, VIMDLL: no, GUI: no, arch: x86 } + - { features: TINY, toolchain: mingw, VIMDLL: no, GUI: no, arch: x64 } steps: - name: Initialize @@ -90,7 +90,6 @@ jobs: echo "VCARCH=x86" >> $GITHUB_ENV echo "WARCH=ia32" >> $GITHUB_ENV echo "BITS=32" >> $GITHUB_ENV - echo "MSYSTEM=MINGW32" >> $GITHUB_ENV fi echo "VCVARSALL=$(vswhere -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" >> $GITHUB_ENV