Skip to content

Commit 5b4f6ee

Browse files
committed
Update matrices to make Mac builds occur on arm64.
1 parent a6e6c95 commit 5b4f6ee

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

.github/workflows/android.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,15 @@ jobs:
5050
os: ${{ fromJson(needs.prepare_matrix.outputs.matrix_os) }}
5151
architecture: ${{ fromJson(needs.prepare_matrix.outputs.matrix_architecture) }}
5252
python_version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_python_version) }}
53+
exclude:
54+
# Do not attempt to use arm64 on Windows or Linux.
55+
- os: windows-latest
56+
arch: arm64
57+
- os: ubuntu-22.04
58+
arch: arm64
59+
# Do not attempt to use x64 on Mac.
60+
- os: macos-14
61+
arch: x64
5362
steps:
5463
- uses: lukka/get-cmake@latest
5564
with:

.github/workflows/desktop.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ jobs:
7777
# architecture excluees
7878
- os: macos-14
7979
architecture: "x86"
80+
- os: macos-14
81+
architecture: "x64"
8082
# Xcode excludes -- allow only one on osx and linux
8183
- os: ubuntu-22.04
8284
xcode_version: "11.7"

scripts/gha/print_matrix_configuration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"matrix": {
7676
"os": ["ubuntu-22.04", "macos-14"],
7777
"build_type": ["Release", "Debug"],
78-
"architecture": ["x64", "x86"],
78+
"architecture": ["x64", "x86", "arm64"],
7979
"msvc_runtime": ["static","dynamic"],
8080
"xcode_version": ["16.2"],
8181
"python_version": ["3.8"],
@@ -90,7 +90,7 @@
9090
"android": {
9191
"matrix": {
9292
"os": ["ubuntu-22.04", "macos-14", "windows-latest"],
93-
"architecture": ["x64"],
93+
"architecture": ["x64, arm64"],
9494
"python_version": ["3.8"],
9595

9696
EXPANDED_KEY: {

0 commit comments

Comments
 (0)