CI: Try UCRT64 for Windows build

radioactiveman · Mar 9, 2024 · f9eeed0 · f9eeed0
1 parent 8050e8b
commit f9eeed0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git 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/actions/run-action/action.yml b/.github/actions/run-action/action.yml
@@ -20,6 +20,8 @@ runs:
       if: (!startsWith(inputs.os, 'windows'))
       shell: bash
 
-    - run: '$GITHUB_ACTION_PATH/run-action.sh "${{ inputs.action }}" "${{ inputs.os }}" "${{ inputs.build-system }}"'
+    - run: |
+        set MSYSTEM=UCRT64
+        sh '$GITHUB_ACTION_PATH/run-action.sh "${{ inputs.action }}" "${{ inputs.os }}" "${{ inputs.build-system }}"'
       if: startsWith(inputs.os, 'windows')
       shell: msys2 {0}
diff --git 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 }}