From 1057c76280dd5cc6a0ab3c25224110937330f72d Mon Sep 17 00:00:00 2001 From: a-maurice Date: Tue, 9 Dec 2025 14:33:08 -0800 Subject: [PATCH] Remove extra iOS targets from GHA tests --- .github/workflows/integration_tests.yml | 4 ---- scripts/gha/print_matrix_configuration.py | 12 +----------- scripts/gha/test_simulator.py | 2 +- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 4c463dc67a..6c856133ea 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -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 diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index bf1d08ff8c..f9d4efb8be 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -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"], @@ -204,11 +204,6 @@ "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"}, @@ -216,12 +211,7 @@ {"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"} ], } diff --git a/scripts/gha/test_simulator.py b/scripts/gha/test_simulator.py index 07336f023b..297d530b1c 100644 --- a/scripts/gha/test_simulator.py +++ b/scripts/gha/test_simulator.py @@ -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"