diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd0888aea..7b06f97b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,21 +47,22 @@ jobs: include: - platform: [iOS, 15] runtime: iOS 15.5 - os: macos-13 - xcode: 15.0.1 + os: macos-14 + xcode: 16.2 install: true - platform: [iOS, 16] runtime: iOS 16.4 - os: macos-13 - xcode: 14.3.1 + os: macos-14 + xcode: 16.2 + install: true - platform: [iOS, 17] runtime: iOS 17.5 os: macos-14 - xcode: 15.4 - - platform: [iOS, 18] - runtime: iOS 18.2 - os: macos-14 xcode: 16.2 + - platform: [iOS, 18] + runtime: iOS 18.5 + os: macos-15 + xcode: 16.4 # - platform: [iOS, 26] # runtime: iOS 26.0 # os: macos-15 @@ -69,21 +70,22 @@ jobs: - platform: [tvOS, 15] runtime: tvOS 15.4 - os: macos-13 - xcode: 15.0.1 + os: macos-14 + xcode: 16.2 install: true - platform: [tvOS, 16] runtime: tvOS 16.4 - os: macos-13 - xcode: 15.0.1 + os: macos-14 + xcode: 16.2 + install: true - platform: [tvOS, 17] runtime: tvOS 17.5 os: macos-14 - xcode: 15.4 - - platform: [tvOS, 18] - runtime: tvOS 18.2 - os: macos-14 xcode: 16.2 + - platform: [tvOS, 18] + runtime: tvOS 18.5 + os: macos-15 + xcode: 16.4 # - platform: [tvOS, 26] # runtime: tvOS 26.0 # os: macos-15 @@ -91,34 +93,31 @@ jobs: - platform: [watchOS, 8] runtime: watchOS 8.5 - os: macos-13 - xcode: 15.0.1 + os: macos-14 + xcode: 16.2 install: true - platform: [watchOS, 9] runtime: watchOS 9.4 - os: macos-13 - xcode: 14.3.1 + os: macos-14 + xcode: 16.2 + install: true - platform: [watchOS, 10] runtime: watchOS 10.5 os: macos-14 - xcode: 15.4 - - platform: [watchOS, 11] - runtime: watchOS 11.2 - os: macos-14 xcode: 16.2 + - platform: [watchOS, 11] + runtime: watchOS 11.5 + os: macos-15 + xcode: 16.4 # - platform: [watchOS, 26] # runtime: watchOS 26.0 # os: macos-15 # xcode: 26.0 - - platform: [macOS, 13] - runtime: macOS 13 - os: macos-13 - xcode: 15.0.1 - platform: [macOS, 14] runtime: macOS 14 os: macos-14 - xcode: 15.4 + xcode: 16.2 - platform: [macOS, 15] runtime: macOS 15 os: macos-15 @@ -131,7 +130,7 @@ jobs: - platform: [visionOS, 1] runtime: visionOS 1.2 os: macos-14 - xcode: 15.4 + xcode: 16.2 - platform: [visionOS, 2] runtime: visionOS 2.5 os: macos-15 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index e53d3d210..9a1187edf 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -67,25 +67,17 @@ lane :test do |options| scheme = options[:scheme].to_s if platform == "macos" - destinations = case version - when 13 - ["platform=macOS"] - else - ["platform=macOS", "platform=macOS,variant=Mac Catalyst"] # TODO: figure out why Catalyst tests fail on macOS 13 - end - for destination in destinations - run_tests( - configuration: configuration, - scheme: scheme, - destination: destination, - catalyst_platform: "macos", - disable_slide_to_type: false, - prelaunch_simulator: false, - ensure_devices_found: true, - force_quit_simulator: false, - disable_concurrent_testing: true, - ) - end + run_tests( + configuration: configuration, + scheme: scheme, + destination: "platform=macOS", + catalyst_platform: "macos", + disable_slide_to_type: false, + prelaunch_simulator: false, + ensure_devices_found: true, + force_quit_simulator: false, + disable_concurrent_testing: true, + ) else unless ["SwiftUIIntrospectTests", "SwiftUIIntrospectUITests"].include?(scheme) raise "Unsupported scheme: #{scheme}" @@ -97,6 +89,7 @@ lane :test do |options| prelaunch_simulator: true, ensure_devices_found: true, force_quit_simulator: true, + reset_simulator: true, disable_concurrent_testing: true, result_bundle: true, output_directory: Dir.pwd + "/test_output",