From a0c8f9aa9e33e1da4b3d7cf83fb3f5f58c25b49f 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 15:51:17 +0200
Subject: [PATCH] workflows: add clang/mingw build

---
 .github/workflows/c-cpp.yml | 38 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 5ab4f0117..36b9010e3 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   build:
-    name: ${{ matrix.build-target.msystem }} makefile build (DEV_BUILD=${{ matrix.dev-build }}, NEW_DYNAREC=${{ matrix.new-dynarec }})
+    name: ${{ matrix.environment.msystem }} makefile build (DEV_BUILD=${{ matrix.dev-build }}, NEW_DYNAREC=${{ matrix.new-dynarec }}, CLANG=${{ matrix.clang }})
 
     runs-on: windows-latest
 
@@ -24,50 +24,40 @@ 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']
-        build-target:
+        clang: ['y', 'n']
+        environment:
           - msystem: MINGW32
             prefix: mingw-w64-i686
             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.build-target.msystem }}
+        msystem: ${{ matrix.environment.msystem }}
         install: >-
           make
-          ${{ 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
+          ${{ matrix.environment.prefix }}-gcc
+          ${{ matrix.environment.prefix }}-clang
+          ${{ matrix.environment.prefix }}-pkg-config
+          ${{ matrix.environment.prefix }}-openal
+          ${{ matrix.environment.prefix }}-freetype
+          ${{ matrix.environment.prefix }}-SDL2
+          ${{ matrix.environment.prefix }}-zlib
+          ${{ matrix.environment.prefix }}-libpng
+          ${{ matrix.environment.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.build-target.x64 }} CLANG=${{ matrix.build-target.clang }} VNC=n
+      run: make -fwin/makefile.mingw -j DEV_BUILD=${{ matrix.dev-build }} NEW_DYNAREC=${{ matrix.new-dynarec }} X64=${{ matrix.environment.x64 }} CLANG=${{ matrix.clang }} VNC=n
       working-directory: ./src