Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1029,12 +1029,8 @@ jobs:
ios_device: ${{ fromJson(needs.check_and_prepare.outputs.ios_device) }}
test_type: ["gameloop"]
exclude:
- ios_device: "ios_min"
test_type: "uitest"
- ios_device: "ios_target"
test_type: "uitest"
- ios_device: "ios_latest"
test_type: "uitest"
build_os: [macos-14]
steps:
- uses: actions/checkout@v3
Expand Down
12 changes: 1 addition & 11 deletions scripts/gha/print_matrix_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
EXPANDED_KEY: {
"ssl_lib": ["openssl", "boringssl"],
"android_device": ["android_target", "android_latest", "emulator_ftl_target", "emulator_ftl_latest"],
"ios_device": ["ios_min", "ios_target", "ios_latest", "simulator_min", "simulator_target", "simulator_latest"],
"ios_device": ["ios_target", "simulator_target"],
"tvos_device": ["tvos_simulator"],
"architecture_windows_linux": ["x64", "x86"],
"architecture_macos": ["x64"],
Expand Down Expand Up @@ -204,24 +204,14 @@
"emulator_target": [ {"type": "virtual", "image":"system-images;android-30;google_apis;x86_64"} ],
"emulator_latest": [ {"type": "virtual", "image":"system-images;android-32;google_apis;x86_64"} ],
"emulator_32bit": [ {"type": "virtual", "image":"system-images;android-30;google_apis;x86"} ],
"ios_min": [
# Slightly different OS versions because of limited FTL selection.
{"type": "ftl", "device": "model=iphone14pro,version=16.6"},
{"type": "ftl", "device": "model=iphone8,version=16.6"},
],
"ios_target": [
# Slightly different OS versions because of limited FTL selection.
{"type": "ftl", "device": "model=iphone14pro,version=16.6"},
{"type": "ftl", "device": "model=iphone11pro,version=16.6"},
{"type": "ftl", "device": "model=iphone8,version=16.6"},
{"type": "ftl", "device": "model=ipad10,version=16.6"},
],
"ios_latest": [
{"type": "ftl", "device": "model=iphone16pro,version=18.3"},
],
"simulator_min": [ {"type": "virtual", "name":"iPhone 15 Pro Max", "version":"17.2"} ],
"simulator_target": [ {"type": "virtual", "name":"iPhone 15 Pro Max", "version":"17.2"} ],
"simulator_latest": [ {"type": "virtual", "name":"iPhone 15 Pro", "version":"17.4"} ],
"tvos_simulator": [ {"type": "virtual", "name":"Apple TV", "version":"17.2"} ],
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/gha/test_simulator.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
iPhone 8, OS 12.0:
--ios_name "iPhone 8" --ios_version "12.0"
Alternatively, to set an iOS device, use the one of the values below:
[simulator_min, simulator_target, simulator_latest]
[simulator_target]
Example:
--ios_device "simulator_target"

Expand Down
Loading