From ec370ea32cd1cf10576464d29bdb5514c56d8d80 Mon Sep 17 00:00:00 2001 From: Jeff <138259519+jdotc1@users.noreply.github.com> Date: Fri, 23 Oct 2026 16:06:35 -0400 Subject: [PATCH 1/3] Use UCRT64 packages for MinGW CI --- .github/workflows/test-mingw.yml | 40 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-mingw.yml index 09e197e49c5..04ad284e7f1 100644 --- a/.github/workflows/test-mingw.yml +++ b/.github/workflows/test-mingw.yml @@ -32,7 +32,7 @@ jobs: run: shell: bash.exe --login -eo pipefail "{0}" env: - MSYSTEM: MINGW64 + MSYSTEM: UCRT64 CHERE_INVOKING: 1 timeout-minutes: 30 @@ -51,25 +51,25 @@ jobs: - name: Install dependencies run: | pacman -S --noconfirm \ - mingw-w64-x86_64-freetype \ - mingw-w64-x86_64-gcc \ - mingw-w64-x86_64-ghostscript \ - mingw-w64-x86_64-lcms2 \ - mingw-w64-x86_64-libavif \ - mingw-w64-x86_64-libimagequant \ - mingw-w64-x86_64-libjpeg-turbo \ - mingw-w64-x86_64-libraqm \ - mingw-w64-x86_64-libtiff \ - mingw-w64-x86_64-libwebp \ - mingw-w64-x86_64-openjpeg2 \ - mingw-w64-x86_64-python-numpy \ - mingw-w64-x86_64-python-olefile \ - mingw-w64-x86_64-python-pip \ - mingw-w64-x86_64-python-psutil \ - mingw-w64-x86_64-python-pytest \ - mingw-w64-x86_64-python-pytest-cov \ - mingw-w64-x86_64-python-pytest-timeout \ - mingw-w64-x86_64-python-pyqt6 + mingw-w64-ucrt-x86_64-freetype \ + mingw-w64-ucrt-x86_64-gcc \ + mingw-w64-ucrt-x86_64-ghostscript \ + mingw-w64-ucrt-x86_64-lcms2 \ + mingw-w64-ucrt-x86_64-libavif \ + mingw-w64-ucrt-x86_64-libimagequant \ + mingw-w64-ucrt-x86_64-libjpeg-turbo \ + mingw-w64-ucrt-x86_64-libraqm \ + mingw-w64-ucrt-x86_64-libtiff \ + mingw-w64-ucrt-x86_64-libwebp \ + mingw-w64-ucrt-x86_64-openjpeg2 \ + mingw-w64-ucrt-x86_64-python-numpy \ + mingw-w64-ucrt-x86_64-python-olefile \ + mingw-w64-ucrt-x86_64-python-pip \ + mingw-w64-ucrt-x86_64-python-psutil \ + mingw-w64-ucrt-x86_64-python-pytest \ + mingw-w64-ucrt-x86_64-python-pytest-cov \ + mingw-w64-ucrt-x86_64-python-pytest-timeout \ + mingw-w64-ucrt-x86_64-python-pyqt6 pushd depends && ./install_extra_test_images.sh && popd From 357ec205b0dabcc42b3164ee13751fc70dee7719 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 24 Oct 2026 13:56:55 +1100 Subject: [PATCH 2/3] Rename job --- .github/workflows/{test-mingw.yml => test-msys2.yml} | 6 +++--- .github/workflows/test-skipped.yml | 6 +++--- README.md | 6 +++--- docs/index.rst | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) rename .github/workflows/{test-mingw.yml => test-msys2.yml} (97%) diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-msys2.yml similarity index 97% rename from .github/workflows/test-mingw.yml rename to .github/workflows/test-msys2.yml index 04ad284e7f1..09d39fcdd42 100644 --- a/.github/workflows/test-mingw.yml +++ b/.github/workflows/test-msys2.yml @@ -1,4 +1,4 @@ -name: Test MinGW +name: Test MSYS2 on: push: @@ -36,7 +36,7 @@ jobs: CHERE_INVOKING: 1 timeout-minutes: 30 - name: "MinGW" + name: "MSYS2 UCRT64" steps: - name: Checkout Pillow @@ -86,4 +86,4 @@ jobs: with: files: ./coverage.xml flags: GHA_Windows - name: "MSYS2 MinGW" + name: "MSYS2 UCRT64" diff --git a/.github/workflows/test-skipped.yml b/.github/workflows/test-skipped.yml index b0490ce9cc3..6e2af975825 100644 --- a/.github/workflows/test-skipped.yml +++ b/.github/workflows/test-skipped.yml @@ -4,7 +4,7 @@ # https://docs.github.com/en/pull-requests/how-tos/merge-and-close-pull-requests/troubleshooting-required-status-checks#handling-skipped-but-required-checks # # Keep the paths below in sync with the paths-ignore lists in test.yml, -# test-docker.yml, test-mingw.yml and test-windows.yml. +# test-docker.yml, test-msys2.yml and test-windows.yml. name: Test skipped @@ -34,9 +34,9 @@ jobs: - name: Success run: echo Tests not required for this change - test-mingw: + test-msys2: runs-on: ubuntu-slim - name: MinGW + name: MSYS2 steps: - name: Success run: echo Tests not required for this change diff --git a/README.md b/README.md index dd6d1d4b6b8..86247418fa1 100644 --- a/README.md +++ b/README.md @@ -35,9 +35,9 @@ Development is supported by: GitHub Actions build status (Test Windows) - GitHub Actions build status (Test MinGW) + GitHub Actions build status (Test MSYS2) GitHub Actions build status (Test Docker) diff --git a/docs/index.rst b/docs/index.rst index 2621ccf372a..c4739271b6b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -25,9 +25,9 @@ Pillow for enterprise is available via the Tidelift Subscription. `Learn more Date: Sat, 24 Oct 2026 13:44:02 +1100 Subject: [PATCH 3/3] Update CI targets --- docs/installation/platform-support.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst index 3111a6c2d00..3112c4b063a 100644 --- a/docs/installation/platform-support.rst +++ b/docs/installation/platform-support.rst @@ -49,7 +49,7 @@ These platforms are built and tested for every change. | Windows Server 2025 | 3.12, 3.13, 3.14, 3.15, | x86-64 | | | PyPy3 | | | +----------------------------+---------------------+ -| | 3.14 (MinGW) | x86-64 | +| | 3.14 (UCRT64) | x86-64 | +----------------------------------+----------------------------+---------------------+