Update build.yml to include MSYS2 clang32 and clang64 build

mcuee · Jan 8, 2024 · 8c97b6e · 8c97b6e
1 parent 0aba46f
commit 8c97b6e
Showing 1 changed file with 55 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -298,7 +298,7 @@ jobs:
             build/src/avrdude.exe
             build/src/avrdude.conf
 
-  clang:
+  clang32:
     runs-on: windows-latest
     defaults:
       run:
@@ -307,12 +307,63 @@ jobs:
       matrix:
         include:
           - { sys: clang, env: i686 }
-          - { sys: clang, env: x86_64 }
     steps:
       - uses: actions/checkout@v3
       - uses: msys2/setup-msys2@v2
         with:
-          msystem: ${{matrix.sys}}
+          msystem: CLANG32
+          update: true
+          install: >-
+            base-devel
+            mingw-w64-clang-${{matrix.env}}-gcc
+            mingw-w64-clang-${{matrix.env}}-cmake
+            mingw-w64-clang-${{matrix.env}}-libelf
+            mingw-w64-clang-${{matrix.env}}-libusb
+            mingw-w64-clang-${{matrix.env}}-libusb-compat-git
+            mingw-w64-clang-${{matrix.env}}-hidapi
+            mingw-w64-clang-${{matrix.env}}-libftdi
+            mingw-w64-clang-${{matrix.env}}-libserialport
+            mingw-w64-clang-${{matrix.env}}-readline
+            mingw-w64-clang-${{matrix.env}}-ncurses
+            mingw-w64-clang-${{matrix.env}}-termcap
+      - name: Configure
+        run: >-
+          cmake
+          -G"MSYS Makefiles"
+          -D DEBUG_CMAKE=1
+          -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+          -B build
+      - name: Build
+        run: cmake --build build
+      - name: Archive build artifacts
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-mingw-clang-${{matrix.env}}
+          path: |
+            build/
+      - name: Archive executables
+        uses: actions/upload-artifact@v3
+        with:
+          name: avrdude-mingw-clang32
+          path: |
+            build/src/avrdude.exe
+            build/src/avrdude.conf
+
+  clang64:
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+    strategy:
+      matrix:
+        include:
+          - { sys: clang, env: x86-64 }
+    steps:
+      - uses: actions/checkout@v3
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: CLANG64
           update: true
           install: >-
             base-devel
@@ -346,7 +397,7 @@ jobs:
       - name: Archive executables
         uses: actions/upload-artifact@v3
         with:
-          name: avrdude-mingw-clang-${{matrix.env}}
+          name: avrdude-mingw-clang64
           path: |
             build/src/avrdude.exe
             build/src/avrdude.conf