Adjusted disk sizes for macOS Tahoe configurations in CI setup.

* Xcode 26.5-beta

* Fixed syntax error in Xcode versions list for Tahoe configuration.

* Updated Tahoe runtimes to include Xcode 26.5 beta versions

* Updated Tahoe runtimes to include Xcode 26.5 beta versions

.ci/cirrus.runner.yml

@@ -2,20 +2,17 @@ task:
   name: "Update Runner Image ($MACOS_VERSION)"
   env:
     matrix:
-      - MACOS_VERSION: sonoma
-        XCODE_VERSIONS: "16.1,16"
-        DISK_SIZE: 240
       - MACOS_VERSION: sequoia
         XCODE_VERSIONS: "\"26.0.1\",16.4,16.3,16.2,16.1,16"
         ADDITIONAL_IOS_BUILDS: "18.5,18.4,18.2,17.5"
         ADDITIONAL_TVOS_BUILDS: "17.5"
         XCODE_COMPONENTS: "\"MetalToolchain\""
-        DISK_SIZE: 400
+        DISK_SIZE: 380
       - MACOS_VERSION: tahoe
-        XCODE_VERSIONS: "\"26.3\",\"26.4-beta-3\",\"26.2\",\"26.1.1\",\"26.0.1\""
+        XCODE_VERSIONS: "\"26.4\",\"26.5-beta\",\"26.3\",\"26.2\",\"26.1.1\",\"26.0.1\""
         XCODE_COMPONENTS: "\"MetalToolchain\""
-        ADDITIONAL_IOS_BUILDS: "18.6,26.2.1"
-        DISK_SIZE: 300
+        ADDITIONAL_IOS_BUILDS: "18.6"
+        DISK_SIZE: 330
   <<: *defaults
   pull_base_script:
     - tart pull ghcr.io/cirruslabs/macos-$MACOS_VERSION-base:latest

data/expected.tahoe.runtimes.txt

@@ -3,10 +3,14 @@ iOS 18.6 (18.6 - 22G86) - com.apple.CoreSimulator.SimRuntime.iOS-18-6
 iOS 26.0 (26.0.1 - 23A8464) - com.apple.CoreSimulator.SimRuntime.iOS-26-0
 iOS 26.1 (26.1 - 23B86) - com.apple.CoreSimulator.SimRuntime.iOS-26-1
 iOS 26.3 (26.3.1 - 23D8133) - com.apple.CoreSimulator.SimRuntime.iOS-26-3
-iOS 26.4 (26.4 - 23E5234a) - com.apple.CoreSimulator.SimRuntime.iOS-26-4
+iOS 26.4 (26.4 - 23E244) - com.apple.CoreSimulator.SimRuntime.iOS-26-4
+iOS 26.5 (26.5 - 23F5043g) - com.apple.CoreSimulator.SimRuntime.iOS-26-5
 tvOS 26.2 (26.2 - 23K51) - com.apple.CoreSimulator.SimRuntime.tvOS-26-2
-tvOS 26.4 (26.4 - 23L5234a) - com.apple.CoreSimulator.SimRuntime.tvOS-26-4
+tvOS 26.4 (26.4 - 23L243) - com.apple.CoreSimulator.SimRuntime.tvOS-26-4
+tvOS 26.5 (26.5 - 23L5443g) - com.apple.CoreSimulator.SimRuntime.tvOS-26-5
 watchOS 26.2 (26.2 - 23S303) - com.apple.CoreSimulator.SimRuntime.watchOS-26-2
-watchOS 26.4 (26.4 - 23T5236a) - com.apple.CoreSimulator.SimRuntime.watchOS-26-4
+watchOS 26.4 (26.4 - 23T239) - com.apple.CoreSimulator.SimRuntime.watchOS-26-4
+watchOS 26.5 (26.5 - 23T5541h) - com.apple.CoreSimulator.SimRuntime.watchOS-26-5
 visionOS 26.2 (26.2 - 23N301) - com.apple.CoreSimulator.SimRuntime.xrOS-26-2
-visionOS 26.4 (26.4 - 23O5235a) - com.apple.CoreSimulator.SimRuntime.xrOS-26-4
+visionOS 26.4 (26.4 - 23O243) - com.apple.CoreSimulator.SimRuntime.xrOS-26-4
+visionOS 26.5 (26.5 - 23O5441g) - com.apple.CoreSimulator.SimRuntime.xrOS-26-5

templates/vanilla-tahoe.pkr.hcl

@@ -12,7 +12,7 @@ packer {
 }
 
 source "tart-cli" "tart" {
-  from_ipsw    = "https://updates.cdn-apple.com/2026WinterFCS/fullrestores/047-60229/6D5DBEA5-75A0-4BEF-ACC9-5ACF9B8DF6B7/UniversalMac_26.3_25D125_Restore.ipsw"
+  from_ipsw    = "https://updates.cdn-apple.com/2026WinterFCS/fullrestores/122-00766/062A6121-2ABE-45D7-BCB1-72B666B6D2C2/UniversalMac_26.4_25E246_Restore.ipsw"
   vm_name      = "tahoe-vanilla"
   cpu_count    = 4
   memory_gb    = 8

templates/xcode.pkr.hcl

@@ -54,7 +54,7 @@ variable "disk_free_mb" {
 
 variable "android_sdk_tools_version" {
   type    = string
-  default = "11076708" # https://developer.android.com/studio#command-line-tools-only
+  default = "14742923" # https://developer.android.com/studio#command-line-tools-only
 }
 
 source "tart-cli" "tart" {
@@ -133,7 +133,7 @@ build {
       "rm android-sdk-tools.zip",
       "mv $ANDROID_HOME/cmdline-tools/cmdline-tools $ANDROID_HOME/cmdline-tools/latest",
       "yes | sdkmanager --licenses",
-      "yes | sdkmanager 'platform-tools' 'platforms;android-35' 'build-tools;35.0.0' 'ndk;27.2.12479018'"
+      "yes | sdkmanager 'platform-tools' 'platforms;android-36' 'build-tools;36.0.0' 'ndk;28.2.13676358'"
     ]
   }