Skip to content

Commit a02e0a4

Browse files
jeremyd2019lazka
authored andcommitted
CI: test CLANGARM64
test cross-compiled arm builds too
1 parent 082ef86 commit a02e0a4

File tree

1 file changed

+26
-6
lines changed

1 file changed

+26
-6
lines changed

.github/workflows/mingw.yml

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,27 @@ on: [push, pull_request, workflow_dispatch]
33

44
jobs:
55
build:
6-
runs-on: windows-2022
6+
runs-on: ${{ matrix.runner }}
77
strategy:
88
fail-fast: false
99
matrix:
10-
msystem: ['MINGW64','MINGW32','UCRT64','CLANG64']
10+
msystem: ['MINGW64','MINGW32','UCRT64','CLANG64','CLANGARM64']
1111
include:
1212
- msystem: MINGW64
1313
prefix: mingw-w64-x86_64
14+
runner: windows-2022
1415
- msystem: MINGW32
1516
prefix: mingw-w64-i686
17+
runner: windows-2022
1618
- msystem: UCRT64
1719
prefix: mingw-w64-ucrt-x86_64
20+
runner: windows-2022
1821
- msystem: CLANG64
1922
prefix: mingw-w64-clang-x86_64
23+
runner: windows-2022
24+
- msystem: CLANGARM64
25+
prefix: mingw-w64-clang-aarch64
26+
runner: windows-11-arm
2027
steps:
2128
- name: Setup git
2229
run: |
@@ -26,7 +33,7 @@ jobs:
2633
- uses: msys2/setup-msys2@v2
2734
with:
2835
msystem: ${{ matrix.msystem }}
29-
release: false
36+
release: ${{ matrix.msystem == 'CLANGARM64' }}
3037
update: true
3138
install: >-
3239
make
@@ -279,19 +286,32 @@ jobs:
279286

280287
cross-llvm-mingw-test:
281288
needs: [cross-llvm-mingw]
282-
runs-on: windows-latest
289+
runs-on: ${{ matrix.runner }}
283290
strategy:
284291
fail-fast: false
285292
matrix:
286-
arch: ['x86_64', 'i686']
293+
arch: ['x86_64', 'i686', 'aarch64', 'armv7']
294+
include:
295+
- arch: x86_64
296+
runner: windows-latest
297+
- arch: i686
298+
runner: windows-latest
299+
- arch: aarch64
300+
runner: windows-11-arm
301+
# we can test this for now, but Windows 11 24H2 dropped support for
302+
# arm32
303+
- arch: armv7
304+
runner: windows-11-arm
287305
steps:
288306
- uses: actions/download-artifact@v4
289307
with:
290308
name: build-cross-llvm-mingw-${{ matrix.arch }}
291309

292310
- name: 'Run tests'
293311
run: |
294-
7z x install.zip
312+
if (Test-Path ./_build) {rm -r -fo ./_build}
313+
Add-Type -AssemblyName System.IO.Compression.FileSystem ;
314+
[System.IO.Compression.ZipFile]::ExtractToDirectory("$PWD\install.zip", "$PWD")
295315
./_build/install/usr/local/bin/python3.exe -c "import sysconfig, pprint; pprint.pprint(sysconfig.get_config_vars())"
296316
297317

0 commit comments

Comments
 (0)