From 55023ab81219a749734312a6a5abe7c4aa11f3fb Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Sat, 9 Mar 2024 14:19:11 +0100 Subject: [PATCH] CI: Try UCRT64 for Windows build --- .github/actions/install-dependencies/action.yml | 14 +++++++------- .github/workflows/c-cpp.yml | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml index e027d0dfa..e58ce4ad9 100644 --- a/.github/actions/install-dependencies/action.yml +++ b/.github/actions/install-dependencies/action.yml @@ -20,12 +20,12 @@ runs: - uses: msys2/setup-msys2@v2 if: startsWith(inputs.os, 'windows') with: - msystem: MINGW64 + msystem: UCRT64 update: true install: >- - mingw-w64-x86_64-autotools - mingw-w64-x86_64-gcc - mingw-w64-x86_64-gtk2 - mingw-w64-x86_64-meson - mingw-w64-x86_64-pkg-config - mingw-w64-x86_64-qt5-base + mingw-w64-ucrt-x86_64-autotools + mingw-w64-ucrt-x86_64-gcc + mingw-w64-ucrt-x86_64-gtk2 + mingw-w64-ucrt-x86_64-meson + mingw-w64-ucrt-x86_64-pkg-config + mingw-w64-ucrt-x86_64-qt5-base diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 32c2fd788..d3a32a77c 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -10,7 +10,8 @@ jobs: build: strategy: matrix: - os: ['ubuntu-20.04', 'ubuntu-22.04', 'macos-12', 'windows-2022'] + #os: ['ubuntu-20.04', 'ubuntu-22.04', 'macos-12', 'windows-2022'] + os: ['windows-2022'] build-system: ['autotools', 'meson'] fail-fast: false runs-on: ${{ matrix.os }}