summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2025-04-18 14:26:44 +1000
committer Vas Crabb <vas@vastheman.com>2025-04-18 14:26:44 +1000
commitaa3dc30a1838d3f0983b744b20834de4dd4ef836 (patch)
tree66e837253154bac5e403b57398617cae2610efb8
parent728014a2b1888d089c7637cd519cf84eb33688a9 (diff)
Added Windows 64-bit ARM build to GitHub Actions CI matrix.
-rw-r--r--.github/workflows/ci-linux.yml2
-rw-r--r--.github/workflows/ci-windows.yml37
2 files changed, 29 insertions, 10 deletions
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index eecc258d3bf..4610644aa1a 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -25,7 +25,6 @@ permissions:
jobs:
build-linux:
- runs-on: ubuntu-latest
strategy:
matrix:
compiler: [gcc, clang]
@@ -41,6 +40,7 @@ jobs:
cxx: clang++
subtarget: mame
executable: mame
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@main
with:
diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index 8d537fab236..19ccea0c86f 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -23,34 +23,53 @@ permissions:
jobs:
build-windows:
- runs-on: windows-latest
- defaults:
- run:
- shell: msys2 {0}
strategy:
matrix:
- compiler: [gcc, clang]
+ compiler: [gcc-x64, clang-x64, clang-arm64]
include:
- - compiler: gcc
+ - compiler: gcc-x64
+ os: windows-latest
+ msys: MINGW64
+ slug: mingw-w64-x86_64
+ root: "/mingw64"
cc: gcc
cxx: g++
subtarget: mame
executable: mame
- - compiler: clang
+ - compiler: clang-x64
+ os: windows-latest
+ msys: MINGW64
+ slug: mingw-w64-x86_64
+ root: "/mingw64"
cc: clang
cxx: clang++
subtarget: tiny
executable: mametiny
+ - compiler: clang-arm64
+ os: windows-11-arm
+ msys: CLANGARM64
+ slug: mingw-w64-clang-aarch64
+ extrapkg: mingw-w64-clang-aarch64-gcc-compat
+ root: "/clangarm64"
+ cc: clang
+ cxx: clang++
+ subtarget: mame
+ executable: mame
+ runs-on: ${{ matrix.os }}
+ defaults:
+ run:
+ shell: msys2 {0}
steps:
- uses: msys2/setup-msys2@v2
with:
- 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++
+ msystem: ${{ matrix.msys }}
+ install: git make ${{ matrix.slug }}-${{ matrix.cc }} ${{ matrix.slug }}-python ${{ matrix.slug }}-lld ${{ matrix.slug }}-llvm ${{ matrix.slug }}-libc++ ${{ matrix.extrapkg }}
- uses: actions/checkout@main
with:
fetch-depth: 0
- name: Build
env:
- MINGW64: "/mingw64"
+ MINGW64: ${{ matrix.root }}
OVERRIDE_AR: "llvm-ar"
OVERRIDE_CC: ${{ matrix.cc }}
OVERRIDE_CXX: ${{ matrix.cxx }}