From f3d04d2411d59bd538f13a21337451c0ab0e4d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= <dhrdlicka@users.noreply.github.com>
Date: Sun, 29 Aug 2021 04:14:21 +0200
Subject: [PATCH] workflows: add msys2/ucrt64 and msys2/clang64

---
 .github/workflows/c-cpp.yml | 47 +++++++++++++++++++++++++------------
 .github/workflows/cmake.yml |  4 ++++
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 4734f1bc4..82db5a769 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   build:
-    name: Build (DEV_BUILD=${{ matrix.dev-build }}, NEW_DYNAREC=${{ matrix.new-dynarec }}, X64=${{ matrix.target-arch.x64 }})
+    name: ${{ matrix.build-target.msystem }} makefile build (DEV_BUILD=${{ matrix.dev-build }}, NEW_DYNAREC=${{ matrix.new-dynarec }})
 
     runs-on: windows-latest
 
@@ -22,33 +22,50 @@ jobs:
       run:
         shell: msys2 {0}
 
+    continue-on-error: ${{ matrix.build-target.continue-on-error }}
+
     strategy:
+      fail-fast: false
       matrix:
         dev-build: ['y', 'n']
         new-dynarec: ['y', 'n']
-        target-arch:
-          - x64: 'n'
-            msystem: MINGW32
+        build-target:
+          - msystem: MINGW32
             prefix: mingw-w64-i686
-          - x64: 'y'
-            msystem: MINGW64
+            x64: n
+            clang: n
+            continue-on-error: false
+          - msystem: MINGW64
             prefix: mingw-w64-x86_64
+            x64: y
+            clang: n
+            continue-on-error: false
+          - msystem: UCRT64
+            prefix: mingw-w64-ucrt-x86_64
+            x64: y
+            clang: n
+            continue-on-error: false
+          - msystem: CLANG64
+            prefix: mingw-w64-clang-x86_64
+            x64: y
+            clang: y
+            continue-on-error: true
 
     steps:
     - uses: msys2/setup-msys2@v2
       with:
         update: true
-        msystem: ${{ matrix.target-arch.msystem }}
+        msystem: ${{ matrix.build-target.msystem }}
         install: >-
           make
-          ${{ matrix.target-arch.prefix }}-toolchain
-          ${{ matrix.target-arch.prefix }}-openal
-          ${{ matrix.target-arch.prefix }}-freetype
-          ${{ matrix.target-arch.prefix }}-SDL2
-          ${{ matrix.target-arch.prefix }}-zlib
-          ${{ matrix.target-arch.prefix }}-libpng
-          ${{ matrix.target-arch.prefix }}-libvncserver
+          ${{ matrix.build-target.prefix }}-toolchain
+          ${{ matrix.build-target.prefix }}-openal
+          ${{ matrix.build-target.prefix }}-freetype
+          ${{ matrix.build-target.prefix }}-SDL2
+          ${{ matrix.build-target.prefix }}-zlib
+          ${{ matrix.build-target.prefix }}-libpng
+          ${{ matrix.build-target.prefix }}-libvncserver
     - uses: actions/checkout@v2
     - name: make
-      run: make -fwin/makefile.mingw -j DEV_BUILD=${{ matrix.dev-build }} NEW_DYNAREC=${{ matrix.new-dynarec }} X64=${{ matrix.target-arch.x64 }} VNC=n
+      run: make -fwin/makefile.mingw -j DEV_BUILD=${{ matrix.dev-build }} NEW_DYNAREC=${{ matrix.new-dynarec }} X64=${{ matrix.build-target.x64 }} CLANG=${{ matrix.build-target.clang }} VNC=n
       working-directory: ./src
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index d34841573..ac722ca35 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -43,6 +43,10 @@ jobs:
             prefix: mingw-w64-i686
           - msystem: MINGW64
             prefix: mingw-w64-x86_64
+          - msystem: UCRT64
+            prefix: mingw-w64-ucrt-x86_64
+          - msystem: CLANG64
+            prefix: mingw-w64-clang-x86_64
 
     steps:
     - uses: msys2/setup-msys2@v2