Update Android SDK tools version and dependencies (#343 )

Updated Android SDK tools versions to reflect most up-to-date default versions used by the Android gradle plugin (9.1.0) - Platform: 36 - Build Tools: 36.0.0 - NDK: 28.2.13676358
macOS & Xcode 26.4 (#340 )
2026-09-30 03:42:04 +02:00 · 2026-03-26 15:40:01 -04:00 · 2026-03-24 21:26:24 -04:00 · 2026-03-21 08:07:50 -04:00 · 2026-03-15 16:32:38 -04:00 · 2026-03-15 13:08:44 -04:00
10 changed files with 76 additions and 26 deletions
@@ -14,11 +14,13 @@ task:
  <<: *defaults
  pull_vanilla_script:
    - tart pull ghcr.io/cirruslabs/macos-$MACOS_VERSION-vanilla:latest
+    - tart clone ghcr.io/cirruslabs/macos-$MACOS_VERSION-vanilla:latest "$MACOS_VERSION-base"
+  disable_sip_script:
+    - packer init "templates/${DISABLE_SIP_TEMPLATE}"
+    - packer build -var vm_name="$MACOS_VERSION-base" "templates/${DISABLE_SIP_TEMPLATE}"
  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}"
+    - packer build -var vm_name="$MACOS_VERSION-base" templates/base.pkr.hcl
  push_base_script:
    - tart push $MACOS_VERSION-base ghcr.io/cirruslabs/macos-$MACOS_VERSION-base:latest
  always:
@@ -1,7 +1,7 @@
 task:
  name: "Release Xcode $CIRRUS_TAG ($MACOS_VERSION)"
  env:
-    XCODE_COMPONENTS: "MetalToolchain"
+    XCODE_COMPONENTS: "\"MetalToolchain\""
    matrix:
      - MACOS_VERSION: tahoe
      - MACOS_VERSION: sequoia
@@ -10,7 +10,7 @@ task:
    - tart pull ghcr.io/cirruslabs/macos-$MACOS_VERSION-base:latest
  build_script:
    - packer init templates/xcode.pkr.hcl
-    - packer build -var macos_version="$MACOS_VERSION" -var xcode_version="[\"$CIRRUS_TAG\"]" -var xcode_components="[\"$XCODE_COMPONENTS\"]" templates/xcode.pkr.hcl
+    - packer build -var macos_version="$MACOS_VERSION" -var xcode_version="[\"$CIRRUS_TAG\"]" -var xcode_components="[$XCODE_COMPONENTS]" templates/xcode.pkr.hcl
  push_script: |
    if [[ $CIRRUS_TAG == *"beta"* ]]
    then
@@ -2,9 +2,6 @@ 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"
@@ -12,7 +9,7 @@ task:
        XCODE_COMPONENTS: "\"MetalToolchain\""
        DISK_SIZE: 400
      - MACOS_VERSION: tahoe
-        XCODE_VERSIONS: "\"26.3\",\"26.4-beta-2\",\"26.2\",\"26.1.1\",\"26.0.1\""
+        XCODE_VERSIONS: "\"26.4\",\"26.3\",\"26.2\",\"26.1.1\",\"26.0.1\""
        XCODE_COMPONENTS: "\"MetalToolchain\""
        ADDITIONAL_IOS_BUILDS: "18.6"
        DISK_SIZE: 300
@@ -5,14 +5,14 @@ task:
    matrix:
      - MACOS_VERSION: tahoe
        XCODE_VERSION: "26.2"
-        XCODE_COMPONENTS: "MetalToolchain"
+        XCODE_COMPONENTS: "\"MetalToolchain\""
        LATEST: true
      - MACOS_VERSION: tahoe
        XCODE_VERSION: "26.1.1"
-        XCODE_COMPONENTS: "MetalToolchain"
+        XCODE_COMPONENTS: "\"MetalToolchain\""
      - MACOS_VERSION: tahoe
        XCODE_VERSION: "26.0.1"
-        XCODE_COMPONENTS: "MetalToolchain"
+        XCODE_COMPONENTS: "\"MetalToolchain\""
      - MACOS_VERSION: sequoia
        XCODE_VERSION: 16.4
        LATEST: true
@@ -36,7 +36,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\"]" -var xcode_components="[\"$XCODE_COMPONENTS\"]" 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
@@ -15,7 +15,7 @@ packer build -var vm_name=sonoma-vanilla templates/disable-sip.pkr.hcl
 ## Building Base Image

 ```bash
-packer build -var macos_version=sonoma templates/base.pkr.hcl
+packer build -var vm_name=sonoma-vanilla templates/base.pkr.hcl
 ```

 ## Building Xcode Image
@@ -2,11 +2,11 @@
 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.2 (26.2 - 23C54) - com.apple.CoreSimulator.SimRuntime.iOS-26-2
-iOS 26.4 (26.4 - 23E5218e) - com.apple.CoreSimulator.SimRuntime.iOS-26-4
+iOS 26.3 (26.3.1 - 23D8133) - com.apple.CoreSimulator.SimRuntime.iOS-26-3
+iOS 26.4 (26.4 - 23E244) - com.apple.CoreSimulator.SimRuntime.iOS-26-4
 tvOS 26.2 (26.2 - 23K51) - com.apple.CoreSimulator.SimRuntime.tvOS-26-2
-tvOS 26.4 (26.4 - 23L5219e) - com.apple.CoreSimulator.SimRuntime.tvOS-26-4
+tvOS 26.4 (26.4 - 23L243) - com.apple.CoreSimulator.SimRuntime.tvOS-26-4
 watchOS 26.2 (26.2 - 23S303) - com.apple.CoreSimulator.SimRuntime.watchOS-26-2
-watchOS 26.4 (26.4 - 23T5221e) - com.apple.CoreSimulator.SimRuntime.watchOS-26-4
+watchOS 26.4 (26.4 - 23T239) - com.apple.CoreSimulator.SimRuntime.watchOS-26-4
 visionOS 26.2 (26.2 - 23N301) - com.apple.CoreSimulator.SimRuntime.xrOS-26-2
-visionOS 26.4 (26.4 - 23O5220e) - com.apple.CoreSimulator.SimRuntime.xrOS-26-4
+visionOS 26.4 (26.4 - 23O243) - com.apple.CoreSimulator.SimRuntime.xrOS-26-4
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+source ~/.zprofile
+
+# Set shell options to enable fail-fast behavior
+#
+# * -e: fail the script when an error occurs or command fails
+# * -u: fail the script when attempting to reference unset parameters
+# * -o pipefail: by default an exit status of a pipeline is that of its
+#                last command, this fails the pipe early if an error in
+#                any of its commands occurs
+#
+set -euo pipefail
+
+update_tcc_database() {
+  sudo sqlite3 "$1" <<-'EOF'
+	INSERT OR REPLACE
+	INTO access (
+	  service,
+	  client_type,
+	  client,
+	  auth_value,
+	  auth_reason,
+	  auth_version,
+	  indirect_object_identifier_type,
+	  indirect_object_identifier
+	) VALUES
+	-- Indirect osascript invocation via SSH
+	('kTCCServiceAccessibility', 1, '/usr/libexec/sshd-keygen-wrapper', 2, 0, 1, NULL, 'UNUSED'),
+	('kTCCServiceScreenCapture', 1, '/usr/libexec/sshd-keygen-wrapper', 2, 0, 1, NULL, 'UNUSED'),
+	('kTCCServicePostEvent', 1, '/usr/libexec/sshd-keygen-wrapper', 2, 0, 1, NULL, 'UNUSED'),
+	('kTCCServiceAppleEvents', 1, '/usr/libexec/sshd-keygen-wrapper', 2, 0, 1, 0, 'com.apple.systemevents'),
+	('kTCCServiceAppleEvents', 1, '/usr/libexec/sshd-keygen-wrapper', 2, 0, 1, 0, 'com.apple.Safari'),
+	-- Direct osascript invocation
+	('kTCCServiceAccessibility', 1, '/usr/bin/osascript', 2, 0, 1, NULL, 'UNUSED'),
+	('kTCCServiceScreenCapture', 1, '/usr/bin/osascript', 2, 0, 1, NULL, 'UNUSED'),
+	('kTCCServicePostEvent', 1, '/usr/bin/osascript', 2, 0, 1, NULL, 'UNUSED'),
+	('kTCCServiceAppleEvents', 1, '/usr/bin/osascript', 2, 0, 1, 0, 'com.apple.systemevents'),
+	('kTCCServiceAppleEvents', 1, '/usr/bin/osascript', 2, 0, 1, 0, 'com.apple.Safari');
+	EOF
+}
+
+# Update TCC.db for all users
+update_tcc_database "/Library/Application Support/com.apple.TCC/TCC.db"
+
+# Update TCC.db for the current user
+update_tcc_database "${HOME}/Library/Application Support/com.apple.TCC/TCC.db"
@@ -7,13 +7,12 @@ packer {
  }
 }

-variable "macos_version" {
+variable "vm_name" {
  type = string
 }

 source "tart-cli" "tart" {
-  vm_base_name = "ghcr.io/cirruslabs/macos-${var.macos_version}-vanilla:latest"
-  vm_name      = "${var.macos_version}-base"
+  vm_name      = "${var.vm_name}"
  cpu_count    = 4
  memory_gb    = 8
  disk_size_gb = 50
@@ -178,4 +177,9 @@ build {
      "sudo chmod 0644 /Library/LaunchAgents/org.cirruslabs.tart-guest-agent.plist",
    ]
  }
+
+  # Update TCC.db and allow automation tools
+  provisioner "shell" {
+    script = "scripts/update-tcc-database.sh"
+  }
 }
@@ -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
@@ -44,7 +44,7 @@ variable "tag" {

 variable "disk_size" {
  type = number
-  default = 120
+  default = 140
 }

 variable "disk_free_mb" {
@@ -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'"
    ]
  }
Author	SHA1	Message	Date
Jacob Rhoda	5e65e3e712	Update Android SDK tools version and dependencies (#343 ) Updated Android SDK tools versions to reflect most up-to-date default versions used by the Android gradle plugin (9.1.0) - Platform: 36 - Build Tools: 36.0.0 - NDK: 28.2.13676358	2026-03-26 15:40:01 -04:00
Fedor Korotkov	5cf26631b9	macOS & Xcode 26.4 (#340 ) * macOS & Xcode 26.4 * No Sonoma runner image * Updated Tahoe tvOS 26.4 runtime to release version 23L243	2026-03-24 21:26:24 -04:00
Fedor Korotkov	0d8fe3156a	Xcode 26.4 RC (#337 ) * Xcode 16.4 RC * Updated disk size for Sonoma CI runner and Tahoe runtimes to final Xcode 26.4 release versions.	2026-03-21 08:07:50 -04:00
Fedor Korotkov	69866eb29b	Xcode 26.4 Beta 3 (#332 ) * Xcode 26.4 Beta 3 * Updated Tahoe runtimes and added iOS 26.2 builds to Cirrus configuration * Updated Tahoe runtimes and added iOS 26.2 builds to Cirrus configuration * Removed iOS 26.2 from Tahoe runtimes list	2026-03-15 16:32:38 -04:00
Nikolay Edigaryev	f2e700cda3	xcode.pkr.hcl: increase disk size from 120 to 140 GB (#333 )	2026-03-15 13:08:44 -04:00
Nikolay Edigaryev	494e62f0b8	Disable SIP before running templates/base.pkr.hcl (#331 ) * Disable SIP before running templates/base.pkr.hcl * Don't forget to "packer init" before each "packer build"	2026-03-15 10:46:21 +01:00
Nikolay Edigaryev	27def7c5ce	Prevent an array with empty element when XCODE_COMPONENTS is unset (#330 )	2026-03-13 17:23:50 -04:00
Nikolay Edigaryev	f9c2b3c122	base.pkr.hcl: update TCC.db and allow automation tools (#329 )	2026-03-12 13:01:54 +01:00