diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index e569b310..56b7cce3 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -366,19 +366,6 @@ Configurations: 'VCPKG_HOST_TRIPLET=x64-linux-qt', 'VCPKG_TARGET_TRIPLET=x64-linux-qt', ] -- - Id: 'ios-universal' - Template: 'qtci-macos-26-arm-105' - Target os: 'IOS_ANY' - Target arch: 'arm64' - Compiler: 'Clang' - Target compiler: 'Clang' - Platform dependency: 'macos-universal-on-arm64' - Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors', 'GenerateSBOM', 'VerifySBOM'] - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang', - 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include -DFFMPEG_DIR={{.Env.FFMPEG_DIR_IOS}} -DQT_DEPLOY_FFMPEG=TRUE', - ] - Id: 'ios-device' Template: 'qtci-macos-26-arm-105' diff --git a/coin/platform_configs/nightly_ios_test.yaml b/coin/platform_configs/nightly_ios_test.yaml index b8ccaeae..d8a15a0b 100644 --- a/coin/platform_configs/nightly_ios_test.yaml +++ b/coin/platform_configs/nightly_ios_test.yaml @@ -2,7 +2,7 @@ Version: 2 Module only: True Include: [ cmake_platforms.yaml: [ - "ios-universal" + "ios-arm64-simulator" ] ] Configurations: @@ -12,7 +12,7 @@ Configurations: Compiler: 'Clang' Target os: 'IOS_ANY' Target arch: 'arm64' - Platform dependency: 'ios-universal' + Platform dependency: 'ios-arm64-simulator' Features: ['TestOnly', 'Insignificant', 'DoNotAbortTestingOnFirstFailure'] Environment variables: [ 'APPLE_SIMULATOR_DEVICE_TYPE=com.apple.CoreSimulator.SimDeviceType.iPad-Pro-13-inch-M4-8GB', diff --git a/coin/platform_configs/precheck.yaml b/coin/platform_configs/precheck.yaml index fdb45371..4ece5ff7 100644 --- a/coin/platform_configs/precheck.yaml +++ b/coin/platform_configs/precheck.yaml @@ -7,7 +7,7 @@ Include: [ "ubuntu-22.04-developer-build-x11-tests", "ubuntu-24.04-x64", "windows-11_24H2-msvc2022-developer-build", - "ios-universal", + "ios-device", "documentation-warnings", ], macos.yaml: [