Skip to content

Commit 8c97b6e

Browse files
authored
Update build.yml to include MSYS2 clang32 and clang64 build
1 parent 0aba46f commit 8c97b6e

File tree

1 file changed

+55
-4
lines changed

1 file changed

+55
-4
lines changed

.github/workflows/build.yml

+55-4
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ jobs:
298298
build/src/avrdude.exe
299299
build/src/avrdude.conf
300300
301-
clang:
301+
clang32:
302302
runs-on: windows-latest
303303
defaults:
304304
run:
@@ -307,12 +307,63 @@ jobs:
307307
matrix:
308308
include:
309309
- { sys: clang, env: i686 }
310-
- { sys: clang, env: x86_64 }
311310
steps:
312311
- uses: actions/checkout@v3
313312
- uses: msys2/setup-msys2@v2
314313
with:
315-
msystem: ${{matrix.sys}}
314+
msystem: CLANG32
315+
update: true
316+
install: >-
317+
base-devel
318+
mingw-w64-clang-${{matrix.env}}-gcc
319+
mingw-w64-clang-${{matrix.env}}-cmake
320+
mingw-w64-clang-${{matrix.env}}-libelf
321+
mingw-w64-clang-${{matrix.env}}-libusb
322+
mingw-w64-clang-${{matrix.env}}-libusb-compat-git
323+
mingw-w64-clang-${{matrix.env}}-hidapi
324+
mingw-w64-clang-${{matrix.env}}-libftdi
325+
mingw-w64-clang-${{matrix.env}}-libserialport
326+
mingw-w64-clang-${{matrix.env}}-readline
327+
mingw-w64-clang-${{matrix.env}}-ncurses
328+
mingw-w64-clang-${{matrix.env}}-termcap
329+
- name: Configure
330+
run: >-
331+
cmake
332+
-G"MSYS Makefiles"
333+
-D DEBUG_CMAKE=1
334+
-D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
335+
-B build
336+
- name: Build
337+
run: cmake --build build
338+
- name: Archive build artifacts
339+
if: always()
340+
uses: actions/upload-artifact@v3
341+
with:
342+
name: build-mingw-clang-${{matrix.env}}
343+
path: |
344+
build/
345+
- name: Archive executables
346+
uses: actions/upload-artifact@v3
347+
with:
348+
name: avrdude-mingw-clang32
349+
path: |
350+
build/src/avrdude.exe
351+
build/src/avrdude.conf
352+
353+
clang64:
354+
runs-on: windows-latest
355+
defaults:
356+
run:
357+
shell: msys2 {0}
358+
strategy:
359+
matrix:
360+
include:
361+
- { sys: clang, env: x86-64 }
362+
steps:
363+
- uses: actions/checkout@v3
364+
- uses: msys2/setup-msys2@v2
365+
with:
366+
msystem: CLANG64
316367
update: true
317368
install: >-
318369
base-devel
@@ -346,7 +397,7 @@ jobs:
346397
- name: Archive executables
347398
uses: actions/upload-artifact@v3
348399
with:
349-
name: avrdude-mingw-clang-${{matrix.env}}
400+
name: avrdude-mingw-clang64
350401
path: |
351402
build/src/avrdude.exe
352403
build/src/avrdude.conf

0 commit comments

Comments
 (0)