@@ -12,54 +12,59 @@ jobs:
1212 - name : ' macOS 26'
1313 os : ' macos-26'
1414 ANDROID_API : 28
15- ANDROID_ARCH : ' arm64-v8a'
16- ANDROID_GPU : ' swiftshader_indirect'
15+ EMULATOR_ARCH : ' arm64-v8a'
16+ # EMULATOR_ARCH: 'armv7'
17+ EMULATOR_GPU : ' swiftshader_indirect'
18+ EMULATOR_ENGINE : ' classic'
1719 - name : ' macOS 26'
1820 os : ' macos-26'
1921 ANDROID_API : 28
20- ANDROID_ARCH : ' arm64-v8a'
21- ANDROID_GPU : ' swiftshader'
22+ EMULATOR_ARCH : ' arm64-v8a'
23+ EMULATOR_GPU : ' swiftshader'
24+ EMULATOR_ENGINE : ' classic'
2225 - name : ' macOS 26'
2326 os : ' macos-26'
2427 ANDROID_API : 28
25- ANDROID_ARCH : ' arm64-v8a'
26- ANDROID_GPU : ' off'
28+ EMULATOR_ARCH : ' arm64-v8a'
29+ EMULATOR_GPU : ' off'
30+ EMULATOR_ENGINE : ' classic'
2731 # - name: 'macOS 15'
2832 # os: 'macos-15'
2933 # ANDROID_API: 28
30- # ANDROID_ARCH : 'arm64-v8a'
31- # ANDROID_GPU : 'swiftshader_indirect'
34+ # EMULATOR_ARCH : 'arm64-v8a'
35+ # EMULATOR_GPU : 'swiftshader_indirect'
3236 # - name: 'macOS 14'
3337 # os: 'macos-14'
3438 # ANDROID_API: 28
35- # ANDROID_ARCH : 'arm64-v8a'
36- # ANDROID_GPU : 'swiftshader_indirect'
39+ # EMULATOR_ARCH : 'arm64-v8a'
40+ # EMULATOR_GPU : 'swiftshader_indirect'
3741 - name : ' macOS 13'
3842 os : ' macos-13'
3943 ANDROID_API : 28
40- ANDROID_ARCH : ' x86_64'
41- ANDROID_GPU : ' swiftshader_indirect'
44+ EMULATOR_ARCH : ' x86_64'
45+ EMULATOR_GPU : ' swiftshader_indirect'
4246 - name : ' Ubuntu Latest'
4347 os : ' ubuntu-latest'
4448 ANDROID_API : 28
45- ANDROID_ARCH : ' x86_64'
46- ANDROID_GPU : ' off'
49+ EMULATOR_ARCH : ' x86_64'
50+ EMULATOR_GPU : ' off'
4751 - name : ' Ubuntu Latest'
4852 os : ' ubuntu-latest'
4953 ANDROID_API : 28
50- ANDROID_ARCH : ' x86_64'
51- ANDROID_GPU : ' swiftshader_indirect'
54+ EMULATOR_ARCH : ' x86_64'
55+ EMULATOR_GPU : ' swiftshader_indirect'
5256 - name : ' Ubuntu Latest'
5357 os : ' ubuntu-latest'
5458 ANDROID_API : 28
55- ANDROID_ARCH : ' x86_64'
56- ANDROID_GPU : ' swiftshader'
59+ EMULATOR_ARCH : ' x86_64'
60+ EMULATOR_GPU : ' swiftshader'
5761 fail-fast : false
5862 runs-on : ${{ matrix.os }}
5963 env :
6064 ANDROID_API : ${{ matrix.ANDROID_API }}
61- ANDROID_ARCH : ${{ matrix.ANDROID_ARCH }}
62- ANDROID_GPU : ${{ matrix.ANDROID_GPU }}
65+ EMULATOR_ARCH : ${{ matrix.EMULATOR_ARCH }}
66+ EMULATOR_GPU : ${{ matrix.EMULATOR_GPU }}
67+ EMULATOR_ENGINE : ${{ matrix.EMULATOR_ENGINE }}
6368 ANDROID_TARGET : ' default'
6469 # ANDROID_BUILD_TOOLS_VERSION: 36.0.0
6570 ANDROID_BUILD_TOOLS_VERSION : ' latest'
8590 echo "ANDROID_AVD_HOME=${XDG_CONFIG_HOME}/.android/avd" >> $GITHUB_ENV
8691 fi
8792
88- - uses : skiptools/swift-android-action@v2
93+ - uses : skiptools/swift-android-action@main
8994 with :
9095 build-package : false
9196
@@ -99,10 +104,10 @@ jobs:
99104 run : sdkmanager --install emulator --channel="${ANDROID_CHANNEL}"
100105
101106 - name : SKDs - download required images
102- run : sdkmanager --install "system-images;android-${ANDROID_API};${ANDROID_TARGET};${ANDROID_ARCH }" --channel="${ANDROID_CHANNEL}"
107+ run : sdkmanager --install "system-images;android-${ANDROID_API};${ANDROID_TARGET};${EMULATOR_ARCH }" --channel="${ANDROID_CHANNEL}"
103108
104109 - name : Emulator - Create
105- run : avdmanager --verbose create avd --force -n "${ANDROID_EMULATOR_NAME}" --device "${ANDROID_PROFILE}" --abi "${ANDROID_TARGET}/${ANDROID_ARCH }" --package "system-images;android-${ANDROID_API};${ANDROID_TARGET};${ANDROID_ARCH }" --sdcard 512M
110+ run : avdmanager --verbose create avd --force -n "${ANDROID_EMULATOR_NAME}" --device "${ANDROID_PROFILE}" --abi "${ANDROID_TARGET}/${EMULATOR_ARCH }" --package "system-images;android-${ANDROID_API};${ANDROID_TARGET};${EMULATOR_ARCH }" --sdcard 512M
106111
107112 - name : Emulator - Find AVDs
108113 run : find ~/ -type d -name '*.avd'
@@ -111,7 +116,7 @@ jobs:
111116 run : emulator -list-avds
112117
113118 - name : Emulator - Boot
114- run : emulator -memory 4096 -avd "${ANDROID_EMULATOR_NAME}" -wipe-data -no-window -accel off -no-accel -gpu "${ANDROID_GPU }" -no-snapshot -noaudio -no-boot-anim &
119+ run : emulator -memory 4096 -avd "${ANDROID_EMULATOR_NAME}" -wipe-data -no-window -accel off -no-accel -gpu "${EMULATOR_GPU}" -engine "${EMULATOR_ENGINE }" -no-snapshot -noaudio -no-boot-anim &
115120
116121 - name : ADB Wait For Device
117122 run : adb wait-for-any-device
@@ -127,5 +132,5 @@ jobs:
127132 cd PackageDemo
128133 swift package init
129134 swift test
130- skip android test
135+ skip android test --arch ${EMULATOR_ARCH}
131136
0 commit comments