Skip to content

Commit 62c772b

Browse files
authored
Remove extra iOS targets from GHA tests (#1806)
1 parent 9fc5959 commit 62c772b

File tree

3 files changed

+2
-16
lines changed

3 files changed

+2
-16
lines changed

.github/workflows/integration_tests.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,12 +1029,8 @@ jobs:
10291029
ios_device: ${{ fromJson(needs.check_and_prepare.outputs.ios_device) }}
10301030
test_type: ["gameloop"]
10311031
exclude:
1032-
- ios_device: "ios_min"
1033-
test_type: "uitest"
10341032
- ios_device: "ios_target"
10351033
test_type: "uitest"
1036-
- ios_device: "ios_latest"
1037-
test_type: "uitest"
10381034
build_os: [macos-14]
10391035
steps:
10401036
- uses: actions/checkout@v3

scripts/gha/print_matrix_configuration.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
EXPANDED_KEY: {
128128
"ssl_lib": ["openssl", "boringssl"],
129129
"android_device": ["android_target", "android_latest", "emulator_ftl_target", "emulator_ftl_latest"],
130-
"ios_device": ["ios_min", "ios_target", "ios_latest", "simulator_min", "simulator_target", "simulator_latest"],
130+
"ios_device": ["ios_target", "simulator_target"],
131131
"tvos_device": ["tvos_simulator"],
132132
"architecture_windows_linux": ["x64", "x86"],
133133
"architecture_macos": ["x64"],
@@ -204,24 +204,14 @@
204204
"emulator_target": [ {"type": "virtual", "image":"system-images;android-30;google_apis;x86_64"} ],
205205
"emulator_latest": [ {"type": "virtual", "image":"system-images;android-32;google_apis;x86_64"} ],
206206
"emulator_32bit": [ {"type": "virtual", "image":"system-images;android-30;google_apis;x86"} ],
207-
"ios_min": [
208-
# Slightly different OS versions because of limited FTL selection.
209-
{"type": "ftl", "device": "model=iphone14pro,version=16.6"},
210-
{"type": "ftl", "device": "model=iphone8,version=16.6"},
211-
],
212207
"ios_target": [
213208
# Slightly different OS versions because of limited FTL selection.
214209
{"type": "ftl", "device": "model=iphone14pro,version=16.6"},
215210
{"type": "ftl", "device": "model=iphone11pro,version=16.6"},
216211
{"type": "ftl", "device": "model=iphone8,version=16.6"},
217212
{"type": "ftl", "device": "model=ipad10,version=16.6"},
218213
],
219-
"ios_latest": [
220-
{"type": "ftl", "device": "model=iphone16pro,version=18.3"},
221-
],
222-
"simulator_min": [ {"type": "virtual", "name":"iPhone 15 Pro Max", "version":"17.2"} ],
223214
"simulator_target": [ {"type": "virtual", "name":"iPhone 15 Pro Max", "version":"17.2"} ],
224-
"simulator_latest": [ {"type": "virtual", "name":"iPhone 15 Pro", "version":"17.4"} ],
225215
"tvos_simulator": [ {"type": "virtual", "name":"Apple TV", "version":"17.2"} ],
226216
}
227217

scripts/gha/test_simulator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
iPhone 8, OS 12.0:
3838
--ios_name "iPhone 8" --ios_version "12.0"
3939
Alternatively, to set an iOS device, use the one of the values below:
40-
[simulator_min, simulator_target, simulator_latest]
40+
[simulator_target]
4141
Example:
4242
--ios_device "simulator_target"
4343

0 commit comments

Comments
 (0)