Xcode 16.2 RC

It looks like the tab sequence for the Time Zone screen changed in one of the releases after 15.0.

I've testing this key sequence manually and via a packer build and it works with macOS 15.1.1.

.ci/cirrus.release.yml

@@ -1,8 +1,6 @@
 task:
   name: "Release Xcode $CIRRUS_TAG ($MACOS_VERSION)"
   matrix:
-    - env:
-        MACOS_VERSION: sonoma
     - env:
         MACOS_VERSION: sequoia
   <<: *defaults

.ci/cirrus.runner.yml

@@ -1,17 +1,20 @@
 task:
   name: "Update Runner Image ($MACOS_VERSION)"
+  execution_lock: runner-image-update
   env:
     matrix:
       - MACOS_VERSION: sonoma
-        XCODE_VERSIONS: 16,15.4,15.3,15.2
+        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,\"16.1-rc\",15.4"
+        XCODE_VERSIONS: "16.1,\"16.2-rc\",16,15.4"
+        DISK_SIZE: 320
   <<: *defaults
   pull_base_script:
     - tart pull ghcr.io/cirruslabs/macos-$MACOS_VERSION-base:latest
   init_xcode_script: packer init templates/xcode.pkr.hcl
   build_xcode_script: |
-      packer build -var tag=runner -var disk_size=300 \
+      packer build -var tag=runner -var disk_size=$DISK_SIZE \
         -var disk_free_mb=100000 \
         -var macos_version="$MACOS_VERSION" \
         -var xcode_version="[$XCODE_VERSIONS]" \
@@ -21,4 +24,4 @@ task:
     tart push "$MACOS_VERSION-xcode:runner" ghcr.io/cirruslabs/macos-runner:$MACOS_VERSION
   always:
     cleanup_script:
-      - tart delete "$MACOS_VERSION-xcode:runner"
+      - tart delete "$MACOS_VERSION-xcode:runner"

.ci/cirrus.vanilla.yml

@@ -1,44 +1,24 @@
 task:
-  name: "Update Vanilla Sonoma Image"
-  only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH && changesInclude("templates/vanilla-sonoma.pkr.hcl")
+  name: "Update Vanilla Image ($MACOS_VERSION $MACOS_NUMBER)"
+  env:
+    matrix:
+      - MACOS_VERSION: sequoia
+        MACOS_NUMBER: 15.1.1
+      - MACOS_VERSION: sonoma
+        MACOS_NUMBER: 14.6
+      - MACOS_VERSION: ventura
+        MACOS_NUMBER: 13.6
+      - MACOS_VERSION: monterey
+        MACOS_NUMBER: 12.6.1
+  only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH && changesInclude("templates/vanilla-$MACOS_VERSION.pkr.hcl")
   <<: *defaults
   build_script:
-    - packer init templates/vanilla-sonoma.pkr.hcl
-    - packer build templates/vanilla-sonoma.pkr.hcl
+    - packer init templates/vanilla-$MACOS_VERSION.pkr.hcl
+    - packer build templates/vanilla-$MACOS_VERSION.pkr.hcl
   disable_sip_script:
-    - packer build -var vm_name=sonoma-vanilla templates/disable-sip.pkr.hcl
+    - packer build -var vm_name=$MACOS_VERSION-vanilla templates/disable-sip.pkr.hcl
   push_script:
-    - tart push sonoma-vanilla ghcr.io/cirruslabs/macos-sonoma-vanilla:latest ghcr.io/cirruslabs/macos-sonoma-vanilla:14.6
+    - tart push $MACOS_VERSION-vanilla ghcr.io/cirruslabs/macos-$MACOS_VERSION-vanilla:latest ghcr.io/cirruslabs/macos-$MACOS_VERSION-vanilla:$MACOS_NUMBER
   always:
     cleanup_script:
-      - tart delete sonoma-vanilla
-
-task:
-  name: "Update Vanilla Sequoia Image"
-  only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH && changesInclude("templates/vanilla-sequoia.pkr.hcl")
-  <<: *defaults
-  build_script:
-    - packer init templates/vanilla-sequoia.pkr.hcl
-    - packer build templates/vanilla-sequoia.pkr.hcl
-  disable_sip_script:
-    - packer build -var vm_name=sequoia-vanilla templates/disable-sip.pkr.hcl
-  push_script:
-    - tart push sequoia-vanilla ghcr.io/cirruslabs/macos-sequoia-vanilla:latest ghcr.io/cirruslabs/macos-sequoia-vanilla:15.0.1
-  always:
-    cleanup_script:
-      - tart delete sequoia-vanilla
-
-task:
-  name: "Update Vanilla Sequoia Beta Image"
-  only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH && changesInclude("templates/vanilla-sequoia-beta.pkr.hcl")
-  <<: *defaults
-  build_script:
-    - packer init templates/vanilla-sequoia-beta.pkr.hcl
-    - packer build templates/vanilla-sequoia-beta.pkr.hcl
-  disable_sip_script:
-    - packer build -var vm_name=sequoia-vanilla templates/disable-sip.pkr.hcl
-  push_script:
-    - tart push sequoia-vanilla ghcr.io/cirruslabs/macos-sequoia-vanilla:15.1-rc ghcr.io/cirruslabs/macos-sequoia-vanilla:15.1
-  always:
-    cleanup_script:
-      - tart delete sequoia-vanilla
+      - tart delete $MACOS_VERSION-vanilla

.ci/cirrus.xcode.yml

@@ -4,19 +4,29 @@ task:
   env:
     matrix:
       - MACOS_VERSION: sequoia
-        XCODE_VERSION: 16.1-rc
+        XCODE_VERSION: 16.1
+        LATEST: true
+      - MACOS_VERSION: sequoia
+        XCODE_VERSION: 16.2-rc
       - MACOS_VERSION: sequoia
         XCODE_VERSION: 16
+      - MACOS_VERSION: sequoia
+        XCODE_VERSION: 15.4
+      - MACOS_VERSION: sonoma
+        XCODE_VERSION: 16.1
         LATEST: true
       - MACOS_VERSION: sonoma
         XCODE_VERSION: 16
-        LATEST: true
       - MACOS_VERSION: sonoma
         XCODE_VERSION: 15.4
       - MACOS_VERSION: sonoma
         XCODE_VERSION: 15.3
       - MACOS_VERSION: sonoma
         XCODE_VERSION: 15.2
+      - MACOS_VERSION: sonoma
+        XCODE_VERSION: 15.1
+      - MACOS_VERSION: sonoma
+        XCODE_VERSION: 15.0.1
   <<: *defaults
   pull_base_script:
     - tart pull ghcr.io/cirruslabs/macos-$MACOS_VERSION-base:latest

README.md

@@ -7,15 +7,17 @@ The following image variants are currently available:
 
 * `macos-{sequoia,sonoma}-base` image has only `brew` pre-installed and the latest version of `macOS` available
 * `macos-{sequoia,sonoma}-xcode:N` image is based on `macos-{sequoia,sonoma}-base` image and has `Xcode N` with [`Flutter`](https://flutter.dev/) pre-installed
-* `macos-runner:sonoma` image is a variant of `xcode:N` with 3 latest versions of `Xcode` pre-installed and [`xcodes` tool](https://github.com/XcodesOrg/xcodes) to switch between them.
+* `macos-runner:{sequoia,sonoma}` image is a variant of `xcode:N` with several versions of `Xcode` pre-installed and [`xcodes` tool](https://github.com/XcodesOrg/xcodes) to switch between them.
 
 See a full list of VMs available [here](https://github.com/orgs/cirruslabs/packages?tab=packages&q=macos-).
 
 ## Release Cadence
 
 Once a new version of Xcode is released, we will initiate a GitHub release which will automatically build and push
-a new version of the `macos-{sequoia,sonoma}-xcode:N` image as well as `macos-runner:sonoma`. This generally happens within 24 hours
-of a release. Please watch this repository releases to get notified about new images.
+a new version of the `macos-sequoia-xcode:N`. This generally happens within 24 hours of a release.
+Please watch this repository releases to get notified about new images.
+
+For an Xcode release which is non beta and not an RC `ghcr.io/cirruslabs/macos-runner:sequoia` image will also be updated.
 
 ## Update Cadence
 
@@ -23,8 +25,8 @@ Some of the images are regularly getting rebuild in order to update the pre-inst
 monthly on the first Saturday of the month:
 
 * `ghcr.io/cirruslabs/macos-{sequoia,sonoma}-base`
-* `ghcr.io/cirruslabs/macos-sonoma-xcode:{16-beta,latest,15.4,15.3,15.2}`
-* `ghcr.io/cirruslabs/macos-sequoia-xcode:{16-beta}`
+* `ghcr.io/cirruslabs/macos-runner:sonoma` which is a superset of `ghcr.io/cirruslabs/macos-sonoma-xcode:{latest,16.1,16,15.4,15.3,15.2,15.1,15.0.1}`
+* `ghcr.io/cirruslabs/macos-runner:sequoia` which is a superset of `ghcr.io/cirruslabs/macos-sequoia-xcode:{latest,16.1,16.2-rc,16,15.4}`
 
-Note that `ghcr.io/cirruslabs/macos-runner:sonoma` is updated every Sunday and this image is [optimised for startup](https://cirrus-runners.app/blog/2024/04/11/optimizing-startup-time-of-cirrus-runners/)
+Note that `ghcr.io/cirruslabs/macos-runner:{sequoia,sonoma}` are updated every Sunday and these images are [optimised for startup](https://cirrus-runners.app/blog/2024/04/11/optimizing-startup-time-of-cirrus-runners/)
 on Cirrus Runners and Cirrus CI services.

templates/base.pkr.hcl

@@ -59,7 +59,8 @@ build {
       "source ~/.zprofile",
       "brew --version",
       "brew update",
-      "brew install curl wget unzip zip ca-certificates cmake gcc git-lfs jq yq gh gitlab-runner",
+      "brew install wget unzip zip ca-certificates cmake gcc git-lfs jq yq gh gitlab-runner",
+      "brew install curl || true", // doesn't work on Monterey
       "brew install --cask git-credential-manager",
       "git lfs install",
       "sudo softwareupdate --install-rosetta --agree-to-license"

templates/vanilla-monterey.pkr.hcl

@@ -1,21 +1,22 @@
 packer {
   required_plugins {
     tart = {
-      version = ">= 1.12.0"
+      version = ">= 1.2.0"
       source  = "github.com/cirruslabs/tart"
     }
   }
 }
 
 source "tart-cli" "tart" {
-  from_ipsw    = "https://updates.cdn-apple.com/2024FallFCS/fullrestores/062-24344/4BBFA6BD-C58F-4C82-B793-6ECA98024379/UniversalMac_15.1_24B82_Restore.ipsw"
-  vm_name      = "sequoia-vanilla"
+  # You can find macOS IPSW URLs on various websites like https://ipsw.me/
+  from_ipsw    = "https://updates.cdn-apple.com/2022FallFCS/fullrestores/012-66032/8D8D90C6-A876-4FFF-BBF4-D158939B3841/UniversalMac_12.6.1_21G217_Restore.ipsw"
+  vm_name      = "monterey-vanilla"
   cpu_count    = 4
   memory_gb    = 8
   disk_size_gb = 40
   ssh_password = "admin"
   ssh_username = "admin"
-  ssh_timeout  = "300s"
+  ssh_timeout  = "120s"
   boot_command = [
     # hello, hola, bonjour, etc.
     "<wait60s><spacebar>",
@@ -48,36 +49,31 @@ source "tart-cli" "tart" {
     # Create a Computer Account
     "<wait10s>admin<tab><tab>admin<tab>admin<tab><tab><tab><spacebar>",
     # Enable Location Services
-    "<wait120s><leftShiftOn><tab><leftShiftOff><spacebar>",
+    "<wait10s><leftShiftOn><tab><leftShiftOff><spacebar>",
     # Are you sure you don't want to use Location Services?
     "<wait10s><tab><spacebar>",
     # Select Your Time Zone
     "<wait10s><tab>UTC<enter><leftShiftOn><tab><leftShiftOff><spacebar>",
     # Analytics
-    "<wait10s><leftShiftOn><tab><leftShiftOff><spacebar>",
+    "<wait10s><tab><spacebar><leftShiftOn><tab><leftShiftOff><spacebar>",
     # Screen Time
     "<wait10s><tab><spacebar>",
     # Siri
     "<wait10s><tab><spacebar><leftShiftOn><tab><leftShiftOff><spacebar>",
     # Choose Your Look
     "<wait10s><leftShiftOn><tab><leftShiftOff><spacebar>",
-    # Welcome to Mac
-    "<wait10s><spacebar>",
-    # 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>q<leftAltOff>",
-    # Now that the installation is done, open "System Settings"
-    "<wait10s><leftAltOn><spacebar><leftAltOff>System Settings<enter>",
+    # Enable Voice Over
+    "<wait10s><leftAltOn><f5><leftAltOff><wait5s>v",
+    # Now that the installation is done, open "System Preferences"
+    "<wait10s><leftAltOn><spacebar><leftAltOff>System Preferences<enter>",
     # Navigate to "Sharing"
-    "<wait10s><leftAltOn>f<leftAltOff>sharing<enter>",
-    # Navigate to "Screen Sharing" and enable it
-    "<wait10s><tab><tab><tab><tab><tab><spacebar>",
-    # Navigate to "Remote Login" and enable it
-    "<wait10s><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><tab><spacebar>",
-    # Quit System Settings
-    "<wait10s><leftAltOn>q<leftAltOff>",
+    "<wait10s>sharing<enter>",
+    # Enable Screen Sharing
+    "<wait10s><tab><tab><tab><tab><spacebar>",
+    # Enable Remote Login
+    "<wait10s><down><down><down><down><spacebar><tab><tab><spacebar>",
+    # Disable Voice Over
+    "<leftAltOn><f5><leftAltOff>",
   ]
 
   // A (hopefully) temporary workaround for Virtualization.Framework's
@@ -91,7 +87,7 @@ build {
   provisioner "shell" {
     inline = [
       // Enable passwordless sudo
-      "echo admin | sudo -S sh -c \"mkdir -p /etc/sudoers.d/; echo 'admin ALL=(ALL) NOPASSWD: ALL' | EDITOR=tee visudo /etc/sudoers.d/admin-nopasswd\"",
+      "echo admin | sudo -S sh -c \"echo 'admin ALL=(ALL) NOPASSWD: ALL' | EDITOR=tee visudo /etc/sudoers.d/admin-nopasswd\"",
       // Enable auto-login
       //
       // See https://github.com/xfreebird/kcpassword for details.
@@ -102,7 +98,9 @@ build {
       // Disable screensaver for admin user
       "defaults -currentHost write com.apple.screensaver idleTime 0",
       // Prevent the VM from sleeping
+      "sudo systemsetup -setdisplaysleep Off 2>/dev/null",
       "sudo systemsetup -setsleep Off 2>/dev/null",
+      "sudo systemsetup -setcomputersleep Off 2>/dev/null",
       // Launch Safari to populate the defaults
       "/Applications/Safari.app/Contents/MacOS/Safari &",
       "SAFARI_PID=$!",

templates/vanilla-sequoia.pkr.hcl

@@ -8,7 +8,7 @@ packer {
 }
 
 source "tart-cli" "tart" {
-  from_ipsw    = "https://updates.cdn-apple.com/2024FallFCS/fullrestores/072-01423/566E5B4E-1100-4643-91B3-131247351844/UniversalMac_15.0.1_24A348_Restore.ipsw"
+  from_ipsw    = "https://updates.cdn-apple.com/2024FallFCS/fullrestores/072-30094/44BD016F-6EE3-4EE5-8890-6F9AA008C537/UniversalMac_15.1.1_24B91_Restore.ipsw"
   vm_name      = "sequoia-vanilla"
   cpu_count    = 4
   memory_gb    = 8
@@ -52,7 +52,7 @@ source "tart-cli" "tart" {
     # Are you sure you don't want to use Location Services?
     "<wait10s><tab><spacebar>",
     # Select Your Time Zone
-    "<wait10s><tab>UTC<enter><leftShiftOn><tab><leftShiftOff><spacebar>",
+    "<wait10s><tab><tab>UTC<enter><leftShiftOn><tab><tab><leftShiftOff><spacebar>",
     # Analytics
     "<wait10s><leftShiftOn><tab><leftShiftOff><spacebar>",
     # Screen Time

templates/xcode.pkr.hcl

@@ -37,7 +37,7 @@ variable "disk_free_mb" {
 
 variable "android_sdk_tools_version" {
   type    = string
-  default = "11076708" # https://developer.android.com/studio/#command-tools
+  default = "11076708" # https://developer.android.com/studio#command-line-tools-only
 }
 
 source "tart-cli" "tart" {
@@ -55,7 +55,7 @@ source "tart-cli" "tart" {
 
 locals {
   xcode_install_provisioners = [
-    for version in var.xcode_version : {
+    for version in reverse(sort(var.xcode_version)) : {
       type = "shell"
       inline = [
         "source ~/.zprofile",
@@ -112,7 +112,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-33' 'build-tools;34.0.0' 'ndk;25.2.9519653'"
+      "yes | sdkmanager 'platform-tools' 'platforms;android-35' 'build-tools;35.0.0' 'ndk;27.2.12479018'"
     ]
   }
 
@@ -229,4 +229,25 @@ build {
       "test -d /Users/runner"
     ]
   }
+
+  # Disable apsd[1][2] daemon as it causes high CPU usage after boot
+  #
+  # [1]: https://iboysoft.com/wiki/apsd-mac.html
+  # [2]: https://discussions.apple.com/thread/4459153
+  provisioner "shell" {
+    inline = [
+      "sudo launchctl unload -w /System/Library/LaunchDaemons/com.apple.apsd.plist"
+    ]
+  }
+
+  # Wait for the "update_dyld_sim_shared_cache" process[1][2] to finish
+  # to avoid wasting CPU cycles after boot
+  #
+  # [1]: https://apple.stackexchange.com/questions/412101/update-dyld-sim-shared-cache-is-taking-up-a-lot-of-memory
+  # [2]: https://stackoverflow.com/a/68394101/9316533
+  provisioner "shell" {
+    inline = [
+      "sleep 1800"
+    ]
+  }
 }