Skip to content

Commit 4969d23

Browse files
committed
Add ubuntu-24.04-arm runner
1 parent 6550145 commit 4969d23

File tree

1 file changed

+12
-18
lines changed

1 file changed

+12
-18
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,41 +10,35 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
include:
13-
#- name: 'macOS 26'
14-
# os: 'macos-26'
15-
# ANDROID_API: 28
16-
# EMULATOR_ARCH: 'arm64-v8a'
17-
# EMULATOR_GPU: 'swiftshader_indirect'
18-
19-
#- name: 'macOS 15'
13+
#- name: 'macOS 15 ARM'
2014
# os: 'macos-15'
2115
# ANDROID_API: 28
2216
# EMULATOR_ARCH: 'arm64-v8a'
2317
# EMULATOR_ARCH_TRIPLE: 'aarch64'
2418
# EMULATOR_GPU: 'swiftshader_indirect'
2519

26-
#- name: 'macOS 14'
27-
# os: 'macos-14'
28-
# ANDROID_API: 28
29-
# EMULATOR_ARCH: 'arm64-v8a'
30-
# EMULATOR_ARCH_TRIPLE: 'aarch64'
31-
# EMULATOR_GPU: 'swiftshader_indirect'
32-
33-
- name: 'macOS 15 API 28'
20+
- name: 'macOS 15 X86 API 28'
3421
os: 'macos-15-intel'
3522
ANDROID_API: 28
3623
EMULATOR_ARCH: 'x86_64'
3724
EMULATOR_ARCH_TRIPLE: 'x86_64'
3825
EMULATOR_GPU: 'swiftshader_indirect'
3926

40-
- name: 'Ubuntu API 28'
27+
- name: 'Ubuntu X86 API 28'
4128
os: 'ubuntu-latest'
4229
ANDROID_API: 28
4330
EMULATOR_ARCH: 'x86_64'
4431
EMULATOR_ARCH_TRIPLE: 'x86_64'
4532
EMULATOR_GPU: 'swiftshader_indirect'
4633

47-
- name: 'Ubuntu API 35'
34+
- name: 'Ubuntu ARM API 28'
35+
os: 'ubuntu-24.04-arm'
36+
ANDROID_API: 28
37+
EMULATOR_ARCH: 'arm64-v8a'
38+
EMULATOR_ARCH_TRIPLE: 'aarch64'
39+
EMULATOR_GPU: 'swiftshader_indirect'
40+
41+
- name: 'Ubuntu X86 API 35'
4842
os: 'ubuntu-latest'
4943
ANDROID_API: 35
5044
EMULATOR_ARCH: 'x86_64'
@@ -140,7 +134,7 @@ jobs:
140134
mkdir hello
141135
cd hello
142136
swiftly run swift package init --type executable
143-
swiftly run swift build --swift-sdk x86_64-unknown-linux-android${ANDROID_API} --static-swift-stdlib
137+
swiftly run swift build --swift-sdk "${ANDROID_EMULATOR_ARCH_TRIPLE}-unknown-linux-android${ANDROID_API}" --static-swift-stdlib
144138
file .build/debug/hello
145139
146140
- name: Enable KVM

0 commit comments

Comments
 (0)