use mys2 packages on Windows, add exprimental clang/Windows build

invertego · Sep 20, 2021 · e0ce972 · e0ce972
1 parent d8008d4
commit e0ce972
Showing 1 changed file with 39 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,23 +1,32 @@
 name: Build
 on:
   push:
-    branches: [ master ]
-    tags: [ 'v*' ]
+    branches: [ master, build ]
+#    tags: [ 'v*' ]
   pull_request:
     branches: [ master ]
 jobs:
   build:
     strategy:
       matrix:
-        program:
-        - ares
-        os:
-        - name: windows
-          version: latest
-        - name: macos
-          version: latest
-        - name: ubuntu
-          version: latest
+        include:
+        - os:
+            name: windows
+            version: latest
+          compiler: g++
+        - os:
+            name: windows
+            version: latest
+          compiler: clang++
+          exprimental: true
+        - os:
+            name: macos
+            version: latest
+          compiler: clang++
+        - os:
+            name: ubuntu
+            version: latest
+          compiler: g++
     runs-on: ${{ matrix.os.name }}-${{ matrix.os.version }}
     steps:
     - uses: actions/checkout@v2
@@ -26,12 +35,29 @@ jobs:
       run: |
         sudo apt-get update -y -qq
         sudo apt-get install libsdl2-dev libgtksourceview2.0-dev libgtk2.0-dev libao-dev libopenal-dev   
+    - name: Install Dependencies (msys2)
+      uses: msys2/setup-msys2@v2
+      if: matrix.os.name == 'windows'
+      with:
+        msystem: MINGW64
+        update: true
+        install: |
+          make
+          mingw-w64-x86_64-toolchain
+          mingw-w64-x86_64-clang
+          mingw-w64-x86_64-lld
     - name: Make
-      run: make -j4 -C desktop-ui build=optimized local=false lto=true
+      if: matrix.os.name != 'windows'
+      run: make -j4 -C desktop-ui build=optimized local=false lto=true compiler="${{ matrix.compiler }}"
+    - name: Make (msys2)
+      if: matrix.os.name == 'windows'
+      run: make -j4 -C desktop-ui build=optimized local=false lto=true compiler="${{ matrix.compiler }}"
+      shell: msys2 {0}
     - name: Upload
+      if: matrix.exprimental == false
       uses: actions/upload-artifact@v2
       with:
-        name: ${{ matrix.program }}-${{ matrix.os.name }}
+        name: ares-${{ matrix.os.name }}
         path: desktop-ui/out/*