Skip to content

Commit aa3dc30

Browse files
committed
Added Windows 64-bit ARM build to GitHub Actions CI matrix.
1 parent 728014a commit aa3dc30

File tree

2 files changed

+29
-10
lines changed

2 files changed

+29
-10
lines changed

.github/workflows/ci-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ permissions:
2525

2626
jobs:
2727
build-linux:
28-
runs-on: ubuntu-latest
2928
strategy:
3029
matrix:
3130
compiler: [gcc, clang]
@@ -41,6 +40,7 @@ jobs:
4140
cxx: clang++
4241
subtarget: mame
4342
executable: mame
43+
runs-on: ubuntu-latest
4444
steps:
4545
- uses: actions/checkout@main
4646
with:

.github/workflows/ci-windows.yml

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,34 +23,53 @@ permissions:
2323

2424
jobs:
2525
build-windows:
26-
runs-on: windows-latest
27-
defaults:
28-
run:
29-
shell: msys2 {0}
3026
strategy:
3127
matrix:
32-
compiler: [gcc, clang]
28+
compiler: [gcc-x64, clang-x64, clang-arm64]
3329
include:
34-
- compiler: gcc
30+
- compiler: gcc-x64
31+
os: windows-latest
32+
msys: MINGW64
33+
slug: mingw-w64-x86_64
34+
root: "/mingw64"
3535
cc: gcc
3636
cxx: g++
3737
subtarget: mame
3838
executable: mame
39-
- compiler: clang
39+
- compiler: clang-x64
40+
os: windows-latest
41+
msys: MINGW64
42+
slug: mingw-w64-x86_64
43+
root: "/mingw64"
4044
cc: clang
4145
cxx: clang++
4246
subtarget: tiny
4347
executable: mametiny
48+
- compiler: clang-arm64
49+
os: windows-11-arm
50+
msys: CLANGARM64
51+
slug: mingw-w64-clang-aarch64
52+
extrapkg: mingw-w64-clang-aarch64-gcc-compat
53+
root: "/clangarm64"
54+
cc: clang
55+
cxx: clang++
56+
subtarget: mame
57+
executable: mame
58+
runs-on: ${{ matrix.os }}
59+
defaults:
60+
run:
61+
shell: msys2 {0}
4462
steps:
4563
- uses: msys2/setup-msys2@v2
4664
with:
47-
install: git make mingw-w64-x86_64-${{ matrix.compiler }} mingw-w64-x86_64-python mingw-w64-x86_64-lld mingw-w64-x86_64-llvm mingw-w64-x86_64-libc++
65+
msystem: ${{ matrix.msys }}
66+
install: git make ${{ matrix.slug }}-${{ matrix.cc }} ${{ matrix.slug }}-python ${{ matrix.slug }}-lld ${{ matrix.slug }}-llvm ${{ matrix.slug }}-libc++ ${{ matrix.extrapkg }}
4867
- uses: actions/checkout@main
4968
with:
5069
fetch-depth: 0
5170
- name: Build
5271
env:
53-
MINGW64: "/mingw64"
72+
MINGW64: ${{ matrix.root }}
5473
OVERRIDE_AR: "llvm-ar"
5574
OVERRIDE_CC: ${{ matrix.cc }}
5675
OVERRIDE_CXX: ${{ matrix.cxx }}

0 commit comments

Comments
 (0)