From 2fddb597b8c5d0e7458bec3e36873f0edfd041c4 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Mon, 8 Jun 2026 09:15:01 +0300 Subject: [PATCH] Bump the CI workflows to iOS 26.5, centralise default OS version --- PreviewTests/Sources/PreviewTests.swift | 2 +- Tools/Sources/Commands/CI/AccessibilityTests.swift | 2 +- Tools/Sources/Commands/CI/CI.swift | 1 + Tools/Sources/Commands/CI/IntegrationTests.swift | 2 +- Tools/Sources/Commands/CI/PreviewTests.swift | 2 +- Tools/Sources/Commands/CI/RunTests.swift | 6 +++--- Tools/Sources/Commands/CI/UITests.swift | 2 +- Tools/Sources/Commands/CI/UnitTests.swift | 2 +- UITests/Sources/Application.swift | 2 +- ci_scripts/ci_common.sh | 2 +- 10 files changed, 12 insertions(+), 11 deletions(-) diff --git a/PreviewTests/Sources/PreviewTests.swift b/PreviewTests/Sources/PreviewTests.swift index 375a9e753..742398507 100644 --- a/PreviewTests/Sources/PreviewTests.swift +++ b/PreviewTests/Sources/PreviewTests.swift @@ -21,7 +21,7 @@ struct PreviewTests { private let deviceConfig: ViewImageConfig = .iPhoneX private let simulatorDevice: String? = "iPhone14,6" // iPhone SE 3rd Generation - private let requiredOSVersion = (major: 26, minor: 4) + private let requiredOSVersion = (major: 26, minor: 5) /// The key is the name we will give to the snapshot /// The value is the actual device that will be used to render the preview private let snapshotDevices: [SnapshotDevice] = [.init(name: "iPhone", device: "iPhone 17"), diff --git a/Tools/Sources/Commands/CI/AccessibilityTests.swift b/Tools/Sources/Commands/CI/AccessibilityTests.swift index 70dbb2bf0..db4fc6a6e 100644 --- a/Tools/Sources/Commands/CI/AccessibilityTests.swift +++ b/Tools/Sources/Commands/CI/AccessibilityTests.swift @@ -9,7 +9,7 @@ struct AccessibilityTests: AsyncParsableCommand { var device = "iPhone 17" @Option(help: "iOS version for the simulator.") - var osVersion = "26.4.1" + var osVersion = CI.defaultOSVersion func run() async throws { var testsFailed = false diff --git a/Tools/Sources/Commands/CI/CI.swift b/Tools/Sources/Commands/CI/CI.swift index d2539d422..3fe6514af 100644 --- a/Tools/Sources/Commands/CI/CI.swift +++ b/Tools/Sources/Commands/CI/CI.swift @@ -19,6 +19,7 @@ struct CI: ParsableCommand { ReleaseToGitHub.self ]) + static let defaultOSVersion = "26.5" static let testOutputDirectory = "test_output" /// Reads the `MARKETING_VERSION` from `project.yml`. diff --git a/Tools/Sources/Commands/CI/IntegrationTests.swift b/Tools/Sources/Commands/CI/IntegrationTests.swift index 727d67ca4..fbac77dfd 100644 --- a/Tools/Sources/Commands/CI/IntegrationTests.swift +++ b/Tools/Sources/Commands/CI/IntegrationTests.swift @@ -13,7 +13,7 @@ struct IntegrationTests: AsyncParsableCommand { var device = "iPhone 17" @Option(help: "iOS version for the simulator.") - var osVersion = "26.4.1" + var osVersion = CI.defaultOSVersion func run() async throws { // Delete old log files diff --git a/Tools/Sources/Commands/CI/PreviewTests.swift b/Tools/Sources/Commands/CI/PreviewTests.swift index 8364a0ed7..8b28b4826 100644 --- a/Tools/Sources/Commands/CI/PreviewTests.swift +++ b/Tools/Sources/Commands/CI/PreviewTests.swift @@ -10,7 +10,7 @@ struct PreviewTests: AsyncParsableCommand { private static let scheme = "PreviewTests" private static let device = "iPhone SE (3rd generation)" - private static let osVersion = "26.4.1" + private static let osVersion = CI.defaultOSVersion private static let simulatorType = "com.apple.CoreSimulator.SimDeviceType.iPhone-SE-3rd-generation" private static let testPlanPath = "PreviewTests/SupportingFiles/PreviewTests.xctestplan" diff --git a/Tools/Sources/Commands/CI/RunTests.swift b/Tools/Sources/Commands/CI/RunTests.swift index 79f814d07..c2be6afc2 100644 --- a/Tools/Sources/Commands/CI/RunTests.swift +++ b/Tools/Sources/Commands/CI/RunTests.swift @@ -9,7 +9,7 @@ struct RunTests: AsyncParsableCommand { Examples: swift run tools run-tests --scheme UnitTests - swift run tools run-tests --scheme UITests --device iPhone --os-version 26.4 + swift run tools run-tests --scheme UITests --device iPhone --os-version 26.5 swift run tools run-tests --scheme PreviewTests --create-simulator-name "iPhone SE (3rd generation)" \ --create-simulator-type com.apple.CoreSimulator.SimDeviceType.iPhone-SE-3rd-generation """) @@ -20,8 +20,8 @@ struct RunTests: AsyncParsableCommand { @Option(help: "The simulator device name to run tests on (e.g. 'iPhone 17').") var device = "iPhone 17" - @Option(help: "The iOS version to use for the simulator runtime (e.g. '26.4').") - var osVersion = "26.4.1" + @Option(help: "The iOS version to use for the simulator runtime (e.g. '26.5').") + var osVersion = CI.defaultOSVersion var runtime: String { osVersion.split(separator: ".").prefix(2).joined(separator: ".") diff --git a/Tools/Sources/Commands/CI/UITests.swift b/Tools/Sources/Commands/CI/UITests.swift index 512acfcd7..ad46c4cf4 100644 --- a/Tools/Sources/Commands/CI/UITests.swift +++ b/Tools/Sources/Commands/CI/UITests.swift @@ -20,7 +20,7 @@ struct UITests: AsyncParsableCommand { var deviceType: DeviceType @Option(help: "iOS version for the simulator.") - var osVersion = "26.4.1" + var osVersion = CI.defaultOSVersion @Option(help: "Run only a specific test (format: 'ClassName/testName').") var testName: String? diff --git a/Tools/Sources/Commands/CI/UnitTests.swift b/Tools/Sources/Commands/CI/UnitTests.swift index 1ab7e3ac2..260622ab1 100644 --- a/Tools/Sources/Commands/CI/UnitTests.swift +++ b/Tools/Sources/Commands/CI/UnitTests.swift @@ -8,7 +8,7 @@ struct UnitTests: AsyncParsableCommand { @Flag(help: "Skip preview tests") var skipPreviews = false - private static let osVersion = "26.4.1" + private static let osVersion = CI.defaultOSVersion private static let device = "iPhone 17" func run() async throws { diff --git a/UITests/Sources/Application.swift b/UITests/Sources/Application.swift index d98e828ce..07fc9e086 100644 --- a/UITests/Sources/Application.swift +++ b/UITests/Sources/Application.swift @@ -35,7 +35,7 @@ enum Application { private static func checkEnvironments() { let requirediPhoneSimulator = "iPhone18,3" // iPhone 17 let requirediPadSimulator = "iPad15,7" // iPad (A16) - let requiredOSVersion = (major: 26, minor: 4) + let requiredOSVersion = (major: 26, minor: 5) let osVersion = ProcessInfo().operatingSystemVersion guard osVersion.majorVersion == requiredOSVersion.major, osVersion.minorVersion == requiredOSVersion.minor else { diff --git a/ci_scripts/ci_common.sh b/ci_scripts/ci_common.sh index ff948912f..5beef9017 100755 --- a/ci_scripts/ci_common.sh +++ b/ci_scripts/ci_common.sh @@ -39,7 +39,7 @@ setup_github_actions_translations_environment() { xcode_select_for_github_actions() { # We need to select it globally for other processes like xcresultparser and our custom tools to use the same Xcode version. - sudo xcode-select -s /Applications/Xcode_26.4.app + sudo xcode-select -s /Applications/Xcode_26.5.0.app } generate_what_to_test_notes() {