From 1a09db706accc44717a11c7ff1d5ec0fcc04a65f Mon Sep 17 00:00:00 2001 From: Fedor Korotkov Date: Sun, 4 May 2025 08:21:46 -0400 Subject: [PATCH] Xcode 16.4-beta (#233) --- .ci/cirrus.runner.yml | 10 +++++++--- .ci/cirrus.xcode.yml | 4 +++- .cirrus.star | 4 ++-- data/expected.sequoia.runtimes.txt | 8 ++++---- templates/xcode.pkr.hcl | 26 ++++++++++++++------------ 5 files changed, 30 insertions(+), 22 deletions(-) diff --git a/.ci/cirrus.runner.yml b/.ci/cirrus.runner.yml index 0f37add..79aac1d 100644 --- a/.ci/cirrus.runner.yml +++ b/.ci/cirrus.runner.yml @@ -7,8 +7,8 @@ task: XCODE_VERSIONS: "16.1,16,15.4,15.3,15.2,15.1,\"15.0.1\"" DISK_SIZE: 375 - MACOS_VERSION: sequoia - XCODE_VERSIONS: "16.3,16.2,16.1,16,15.4" - ADDITIONAL_IOS_BUILDS: "18.2" + XCODE_VERSIONS: "16.3,\"16.4-beta\",16.2,16.1,16" + ADDITIONAL_IOS_BUILDS: "18.4,18.2" DISK_SIZE: 375 <<: *defaults pull_base_script: @@ -23,7 +23,11 @@ task: -var expected_runtimes_file="data/expected.$MACOS_VERSION.runtimes.txt" \ templates/xcode.pkr.hcl push_script: | - tart push "$MACOS_VERSION-xcode:runner" ghcr.io/cirruslabs/macos-runner:$MACOS_VERSION + if [[ -z "$CIRRUS_CRON" ]]; then + echo "Not a cron build, skipping pushing..." + else + tart push "$MACOS_VERSION-xcode:runner" ghcr.io/cirruslabs/macos-runner:$MACOS_VERSION + fi always: cleanup_script: - tart delete "$MACOS_VERSION-xcode:runner" diff --git a/.ci/cirrus.xcode.yml b/.ci/cirrus.xcode.yml index f7b9215..036b5a0 100644 --- a/.ci/cirrus.xcode.yml +++ b/.ci/cirrus.xcode.yml @@ -3,9 +3,11 @@ task: depends_on: update-base env: matrix: + - MACOS_VERSION: sequoia + XCODE_VERSION: 16.4-beta - MACOS_VERSION: sequoia XCODE_VERSION: 16.3 - LATEST: true + LATEST: true - MACOS_VERSION: sequoia XCODE_VERSION: 16.2 - MACOS_VERSION: sequoia diff --git a/.cirrus.star b/.cirrus.star index db541e5..afc9a9d 100644 --- a/.cirrus.star +++ b/.cirrus.star @@ -1,4 +1,4 @@ -load("cirrus", "env", "http", "fs") +load("cirrus", "env", "http", "fs", "changes_include") load("github.com/cirrus-modules/graphql", "rerun_task_if_issue_in_logs") @@ -46,6 +46,6 @@ def main(ctx): if env.get("CIRRUS_CRON") == "monthly": result += fs.read(".ci/cirrus.base.yml") result += fs.read(".ci/cirrus.xcode.yml") - if env.get("CIRRUS_CRON") == "weekly": + if env.get("CIRRUS_CRON") == "weekly" or changes_include(".ci/cirrus.runner.yml"): result += fs.read(".ci/cirrus.runner.yml") return result diff --git a/data/expected.sequoia.runtimes.txt b/data/expected.sequoia.runtimes.txt index 78a1798..be5276c 100644 --- a/data/expected.sequoia.runtimes.txt +++ b/data/expected.sequoia.runtimes.txt @@ -1,22 +1,22 @@ == Runtimes == -iOS 17.5 (17.5 - 21F79) - com.apple.CoreSimulator.SimRuntime.iOS-17-5 iOS 18.0 (18.0 - 22A3351) - com.apple.CoreSimulator.SimRuntime.iOS-18-0 iOS 18.1 (18.1 - 22B81) - com.apple.CoreSimulator.SimRuntime.iOS-18-1 iOS 18.2 (18.2 - 22C150) - com.apple.CoreSimulator.SimRuntime.iOS-18-2 iOS 18.3 (18.3.1 - 22D8075) - com.apple.CoreSimulator.SimRuntime.iOS-18-3 iOS 18.4 (18.4 - 22E238) - com.apple.CoreSimulator.SimRuntime.iOS-18-4 -tvOS 17.5 (17.5 - 21L569) - com.apple.CoreSimulator.SimRuntime.tvOS-17-5 +iOS 18.5 (18.5 - 22F5067a) - com.apple.CoreSimulator.SimRuntime.iOS-18-5 tvOS 18.0 (18.0 - 22J356) - com.apple.CoreSimulator.SimRuntime.tvOS-18-0 tvOS 18.1 (18.1 - 22J578) - com.apple.CoreSimulator.SimRuntime.tvOS-18-1 tvOS 18.2 (18.2 - 22K154) - com.apple.CoreSimulator.SimRuntime.tvOS-18-2 tvOS 18.4 (18.4 - 22L254) - com.apple.CoreSimulator.SimRuntime.tvOS-18-4 -watchOS 10.5 (10.5 - 21T575) - com.apple.CoreSimulator.SimRuntime.watchOS-10-5 +tvOS 18.5 (18.5 - 22L5565a) - com.apple.CoreSimulator.SimRuntime.tvOS-18-5 watchOS 11.0 (11.0 - 22R349) - com.apple.CoreSimulator.SimRuntime.watchOS-11-0 watchOS 11.1 (11.1 - 22R581) - com.apple.CoreSimulator.SimRuntime.watchOS-11-1 watchOS 11.2 (11.2 - 22S99) - com.apple.CoreSimulator.SimRuntime.watchOS-11-2 watchOS 11.4 (11.4 - 22T250) - com.apple.CoreSimulator.SimRuntime.watchOS-11-4 -visionOS 1.2 (1.2 - 21O5565d) - com.apple.CoreSimulator.SimRuntime.xrOS-1-2 +watchOS 11.5 (11.5 - 22T5566a) - com.apple.CoreSimulator.SimRuntime.watchOS-11-5 visionOS 2.0 (2.0 - 22N318) - com.apple.CoreSimulator.SimRuntime.xrOS-2-0 visionOS 2.1 (2.1 - 22N580) - com.apple.CoreSimulator.SimRuntime.xrOS-2-1 visionOS 2.3 (2.3 - 22N895) - com.apple.CoreSimulator.SimRuntime.xrOS-2-3 visionOS 2.4 (2.4 - 22O237) - com.apple.CoreSimulator.SimRuntime.xrOS-2-4 +visionOS 2.5 (2.5 - 22O5467a) - com.apple.CoreSimulator.SimRuntime.xrOS-2-5 diff --git a/templates/xcode.pkr.hcl b/templates/xcode.pkr.hcl index bd13d22..070ae13 100644 --- a/templates/xcode.pkr.hcl +++ b/templates/xcode.pkr.hcl @@ -122,6 +122,20 @@ build { ] } + provisioner "shell" { + inline = [ + "source ~/.zprofile", + "brew install libimobiledevice ideviceinstaller ios-deploy carthage", + "brew install xcbeautify", + "rbenv global 3.3.8", # fastlane conflicts with 3.4.0+ https://github.com/fastlane/fastlane/issues/29527 + "gem update", + "gem install fastlane", + "gem install cocoapods", + "gem install xcpretty", + "gem uninstall --ignore-dependencies ffi && gem install ffi -- --enable-libffi-alloc" + ] + } + provisioner "shell" { inline = [ "source ~/.zprofile", @@ -199,18 +213,6 @@ build { "flutter precache", ] } - provisioner "shell" { - inline = [ - "source ~/.zprofile", - "brew install libimobiledevice ideviceinstaller ios-deploy carthage", - "brew install xcbeautify", - "gem update", - "gem install fastlane", - "gem install cocoapods", - "gem install xcpretty", - "gem uninstall --ignore-dependencies ffi && gem install ffi -- --enable-libffi-alloc" - ] - } # useful utils for mobile development provisioner "shell" {