vanilla-tahoe.pkr.hcl: adapt "boot_command" to recent installer changes (#271)

* Xcode 26 Beta 7 and macOS 26.0 beta 8

* fixed syntax

.ci/cirrus.base.yml

@@ -4,18 +4,24 @@ task:
   matrix:
     - env:
         MACOS_VERSION: ventura
+        DISABLE_SIP_TEMPLATE: disable-sip.pkr.hcl
     - env:
         MACOS_VERSION: sonoma
+        DISABLE_SIP_TEMPLATE: disable-sip.pkr.hcl
     - env:
         MACOS_VERSION: sequoia
+        DISABLE_SIP_TEMPLATE: disable-sip-with-username.pkr.hcl
     - env:
         MACOS_VERSION: tahoe
+        DISABLE_SIP_TEMPLATE: disable-sip-with-username.pkr.hcl
   <<: *defaults
   pull_vanilla_script:
     - tart pull ghcr.io/cirruslabs/macos-$MACOS_VERSION-vanilla:latest
   build_base_script:
     - packer init templates/base.pkr.hcl
     - packer build -var macos_version="$MACOS_VERSION" templates/base.pkr.hcl
+  disable_sip_script:
+    - packer build -var vm_name=$MACOS_VERSION-base "templates/${DISABLE_SIP_TEMPLATE}"
   push_base_script:
     - tart push $MACOS_VERSION-base ghcr.io/cirruslabs/macos-$MACOS_VERSION-base:latest
   always:

.ci/cirrus.runner.yml

@@ -8,7 +8,7 @@ task:
         ADDITIONAL_IOS_BUILDS: "17.5"
         DISK_SIZE: 275
       - MACOS_VERSION: sequoia
-        XCODE_VERSIONS: "16.4,\"26-beta-6\",16.3,16.2,16.1,16"
+        XCODE_VERSIONS: "16.4,\"26-beta-7\",16.3,16.2,16.1,16"
         ADDITIONAL_IOS_BUILDS: "18.5,18.4,18.2,17.5"
         DISK_SIZE: 600
   <<: *defaults

.ci/cirrus.vanilla.yml

@@ -1,16 +1,13 @@
 env:
   RESOLVE_VM_NAME: "resolve-macos-number-task-id-${CIRRUS_TASK_ID}"
   RESOLVE_FILE: "${RESOLVE_VM_NAME}.txt"
-  DISABLE_SIP_TEMPLATE: disable-sip.pkr.hcl
 
 task:
   name: "Update Vanilla Image ($MACOS_VERSION)"
   env:
     matrix:
       - MACOS_VERSION: tahoe
-        DISABLE_SIP_TEMPLATE: disable-sip-with-username.pkr.hcl
       - MACOS_VERSION: sequoia
-        DISABLE_SIP_TEMPLATE: disable-sip-with-username.pkr.hcl
       - MACOS_VERSION: sonoma
       - MACOS_VERSION: ventura
       - MACOS_VERSION: monterey
@@ -19,8 +16,6 @@ task:
   build_script:
     - packer init templates/vanilla-$MACOS_VERSION.pkr.hcl
     - packer build templates/vanilla-$MACOS_VERSION.pkr.hcl
-  disable_sip_script:
-    - packer build -var vm_name=$MACOS_VERSION-vanilla "templates/${DISABLE_SIP_TEMPLATE}"
   resolve_macos_number_script:
     - packer build -var vm_base_name=$MACOS_VERSION-vanilla -var vm_name=$RESOLVE_VM_NAME -var resolve_file=$RESOLVE_FILE templates/resolve-macos-number.pkr.hcl
     - echo "MACOS_NUMBER=$(cat $RESOLVE_FILE)" >> $CIRRUS_ENV

.ci/cirrus.xcode.yml

@@ -4,7 +4,8 @@ task:
   env:
     matrix:
       - MACOS_VERSION: tahoe
-        XCODE_VERSION: 26-beta-6
+        XCODE_VERSION: 26-beta-7
+        XCODE_COMPONENTS: "MetalToolchain"
         LATEST: true
       - MACOS_VERSION: sequoia
         XCODE_VERSION: 16.4
@@ -32,7 +33,7 @@ task:
     - tart pull ghcr.io/cirruslabs/macos-$MACOS_VERSION-base:latest
   build_xcode_script:
     - packer init templates/xcode.pkr.hcl
-    - packer build -var macos_version="$MACOS_VERSION" -var xcode_version="[\"$XCODE_VERSION\"]" templates/xcode.pkr.hcl
+    - packer build -var macos_version="$MACOS_VERSION" -var xcode_version="[\"$XCODE_VERSION\"]" -var xcode_components="[\"$XCODE_COMPONENTS\"]" templates/xcode.pkr.hcl
   push_script: |
     if [[ -z "$LATEST" ]]
     then

templates/vanilla-tahoe.pkr.hcl

@@ -12,7 +12,7 @@ packer {
 }
 
 source "tart-cli" "tart" {
-  from_ipsw    = "https://updates.cdn-apple.com/2025SummerSeed/fullrestores/093-15545/4C191A6F-E63B-4A9F-8597-6B1880EE09CC/UniversalMac_26.0_25A5346a_Restore.ipsw"
+  from_ipsw    = "https://updates.cdn-apple.com/2025SummerSeed/fullrestores/093-26148/FDF54F82-98DF-4285-A0DB-CB30F4F93C71/UniversalMac_26.0_25A5349a_Restore.ipsw"
   vm_name      = "tahoe-vanilla"
   cpu_count    = 4
   memory_gb    = 8
@@ -58,13 +58,17 @@ source "tart-cli" "tart" {
     # Are you sure you don't want to use Location Services?
     "<wait10s><tab><spacebar>",
     # Select Your Time Zone
-    "<wait10s><tab><tab>UTC<enter><leftShiftOn><tab><tab><leftShiftOff><spacebar>",
+    "<wait10s><tab><tab><tab>UTC<enter><leftShiftOn><tab><leftShiftOff><spacebar>",
     # Analytics
     "<wait10s><leftShiftOn><tab><leftShiftOff><spacebar>",
     # Screen Time
     "<wait10s><tab><tab><spacebar>",
     # Siri
     "<wait10s><tab><spacebar><leftShiftOn><tab><leftShiftOff><spacebar>",
+    # You Mac is Ready for FileVault
+    "<wait10s><leftShiftOn><tab><tab><leftShiftOff><spacebar>",
+    # Mac Data Will Not Be Securely Encrypted
+    "<wait10s><tab><spacebar>",
     # Choose Your Look
     "<wait10s><leftShiftOn><tab><leftShiftOff><spacebar>",
     # Update Mac Automatically
@@ -72,14 +76,14 @@ source "tart-cli" "tart" {
     # Welcome to Mac
     "<wait30s><spacebar>",
     # Disable Voice Over
-    "<leftAltOn><f5><leftAltOff>",
+    "<wait10s><leftAltOn><f5><leftAltOff>",
     # Enable Keyboard navigation
     # This is so that we can navigate the System Settings app using the keyboard
-    "<wait10s><leftAltOn><spacebar><leftAltOff>Terminal<enter>",
-    "<wait10s>defaults write NSGlobalDomain AppleKeyboardUIMode -int 3<enter>",
+    "<wait10s><leftAltOn><spacebar><leftAltOff>Terminal<wait10s><enter>",
+    "<wait10s><wait10s>defaults write NSGlobalDomain AppleKeyboardUIMode -int 3<enter>",
     "<wait10s><leftAltOn>q<leftAltOff>",
     # Now that the installation is done, open "System Settings"
-    "<wait10s><leftAltOn><spacebar><leftAltOff>System Settings<enter>",
+    "<wait10s><leftAltOn><spacebar><leftAltOff>System Settings<wait10s><enter>",
     # Navigate to "Sharing"
     "<wait10s><leftCtrlOn><f2><leftCtrlOff><right><right><right><down>Sharing<enter>",
     # Navigate to "Screen Sharing" and enable it

templates/xcode.pkr.hcl

@@ -20,6 +20,12 @@ variable "additional_ios_builds" {
   default = []
 }
 
+variable "xcode_components" {
+  type    = list(string)
+  default = []
+  description = "Additional Xcode components to download."
+}
+
 variable "expected_runtimes_file" {
   type    = string
   default = ""
@@ -194,6 +200,15 @@ build {
     )
   }
 
+  provisioner "shell" {
+    inline = concat(
+      ["source ~/.zprofile"],
+      [
+        for component in var.xcode_components : "xcodebuild -downloadComponent ${component}"
+      ]
+    )
+  }
+
   provisioner "shell" {
     inline = [
       "source ~/.zprofile",