From 3ad363e469bedf1437d2ff7a9ebdb9e67b81a83e Mon Sep 17 00:00:00 2001
From: invertego <invertego@users.noreply.github.com>
Date: Wed, 19 Oct 2022 07:53:21 -0700
Subject: [PATCH] Added Windows/clang GitHub CI build task. (#10373)

---
 .github/workflows/ci-windows.yml | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index 5026bdf8861..7ba30969d4a 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -23,26 +23,41 @@ permissions:
 
 jobs:
 
-  build-windows-gcc:
+  build-windows:
     runs-on: windows-latest
     defaults:
       run:
         shell: msys2 {0}
+    strategy:
+      matrix:
+        compiler: [gcc, clang]
+        include:
+          - compiler: gcc
+            cc: gcc
+            cxx: g++
+            subtarget: mame
+          - compiler: clang
+            cc: clang
+            cxx: clang++
+            subtarget: tiny
     steps:
     - uses: msys2/setup-msys2@v2
       with:
-        install: git make mingw-w64-x86_64-gcc mingw-w64-x86_64-python mingw-w64-x86_64-lld mingw-w64-x86_64-libc++
+        install: git make mingw-w64-x86_64-${{ matrix.compiler }} mingw-w64-x86_64-python mingw-w64-x86_64-lld mingw-w64-x86_64-libc++
     - uses: actions/checkout@master
     - name: Build
       env:
         MINGW64: "/mingw64"
         ARCHOPTS: "-fuse-ld=lld"
         OVERRIDE_AR: "llvm-ar"
+        OVERRIDE_CC: ${{ matrix.cc }}
+        OVERRIDE_CXX: ${{ matrix.cxx }}
+        SUBTARGET: ${{ matrix.subtarget }}
         TOOLS: 1
       run: make -j2
     - name: Validate
-      run: ./mame -validate
+      run: ./mame* -validate
     - uses: actions/upload-artifact@master
       with:
-        name: mame-windows-gcc-${{ github.sha }}
-        path: mame.exe
+        name: mame-windows-${{ matrix.compiler }}-${{ github.sha }}
+        path: mame*.exe