Update variables.pkrvars.hcl

Co-authored-by: Melvin Gundlach <mgundlach@it-economics.de>

.cirrus.yml

@@ -39,8 +39,13 @@ task:
   build_script:
     - packer init templates/xcode.pkr.hcl
     - packer build -var-file="variables.pkrvars.hcl" -var xcode_version="$CIRRUS_TAG" templates/xcode.pkr.hcl
-  push_script:
-    - tart push ventura-xcode:$CIRRUS_TAG ghcr.io/cirruslabs/macos-ventura-xcode:$CIRRUS_TAG ghcr.io/cirruslabs/macos-ventura-xcode:latest
+  push_script: |
+    if [[ $CIRRUS_TAG == *"beta"* ]]
+    then
+      tart push ventura-xcode:$CIRRUS_TAG ghcr.io/cirruslabs/macos-ventura-xcode:$CIRRUS_TAG
+    else
+      tart push ventura-xcode:$CIRRUS_TAG ghcr.io/cirruslabs/macos-ventura-xcode:$CIRRUS_TAG ghcr.io/cirruslabs/macos-ventura-xcode:latest
+    fi
   always:
     cleanup_script:
       - tart delete ventura-base || true

README.md

@@ -10,24 +10,20 @@ See a full list of VMs available on Cirrus CI [here](https://github.com/orgs/cir
 
 ## Building Vanilla Image
 
-To build `macos-monterey-vanilla`:
-
-```bash
-packer build templates/vanilla-monterey.pkr.hcl
-```
-
 To build `macos-ventura-vanilla`:
 
 ```bash
 packer build templates/vanilla-ventura.pkr.hcl
 ```
 
-Optionally, SIP can be disabled for each image by running the following commands:
+To build `macos-sonoma-vanilla`:
 
 ```bash
-packer build -var vm_name=monterey-vanilla templates/disable-sip.pkr.hcl
+packer build templates/vanilla-sonoma.pkr.hcl
 ```
 
+Optionally, SIP can be disabled for each image by running the following commands:
+
 ```bash
 packer build -var vm_name=ventura-vanilla templates/disable-sip.pkr.hcl
 ```

templates/base.pkr.hcl

@@ -1,22 +1,22 @@
 packer {
   required_plugins {
     tart = {
-      version = ">= 0.5.4"
+      version = ">= 1.2.0"
       source  = "github.com/cirruslabs/tart"
     }
   }
 }
 
 variable "macos_version" {
-  type =  string
+  type = string
 }
 
 variable "gha_version" {
-  type =  string
+  type = string
 }
 
 source "tart-cli" "tart" {
-  vm_base_name = "ghcr.io/cirruslabs/macos-${var.macos_version}-vanilla:13.3.1"
+  vm_base_name = "ghcr.io/cirruslabs/macos-${var.macos_version}-vanilla:latest"
   vm_name      = "${var.macos_version}-base"
   cpu_count    = 4
   memory_gb    = 8
@@ -45,13 +45,6 @@ build {
     ]
   }
 
-  # setup DNS
-  provisioner "shell" {
-    inline = [
-      "networksetup -setdnsservers Ethernet 8.8.8.8 8.8.4.4 1.1.1.1",
-    ]
-  }
-
   # Create a symlink for bash compatibility
   provisioner "shell" {
     inline = [
@@ -110,4 +103,10 @@ build {
       "sudo safaridriver --enable",
     ]
   }
+  provisioner "shell" {
+    inline = [
+      "source ~/.zprofile",
+      "brew install awscli"
+    ]
+  }
 }

templates/disable-sip.pkr.hcl

@@ -1,7 +1,7 @@
 packer {
   required_plugins {
     tart = {
-      version = ">= 0.5.4"
+      version = ">= 1.2.0"
       source  = "github.com/cirruslabs/tart"
     }
   }

templates/vanilla-monterey.pkr.hcl

@@ -1,7 +1,7 @@
 packer {
   required_plugins {
     tart = {
-      version = ">= 0.5.4"
+      version = ">= 1.2.0"
       source  = "github.com/cirruslabs/tart"
     }
   }
@@ -90,6 +90,8 @@ build {
       "sudo defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser admin",
       // Disable screensaver at login screen
       "sudo defaults write /Library/Preferences/com.apple.screensaver loginWindowIdleTime 0",
+      // Disable screensaver for admin user
+      "defaults -currentHost write com.apple.screensaver idleTime 0",
       // Prevent the VM from sleeping
       "sudo systemsetup -setdisplaysleep Off",
       "sudo systemsetup -setsleep Off",

templates/vanilla-sonoma.pkr.hcl

@@ -0,0 +1,123 @@
+packer {
+  required_plugins {
+    tart = {
+      version = ">= 1.2.0"
+      source  = "github.com/cirruslabs/tart"
+    }
+  }
+}
+
+source "tart-cli" "tart" {
+  # Currently macOS 14 (Sonoma) can only be obtained via the following links:
+  # unauthenticated[1] and authenticated[2].
+  #
+  # [1]: https://updates.cdn-apple.com/2023SummerSeed/fullrestores/042-13887/3B4075C1-B695-49EA-82D9-4B720699D341/UniversalMac_14.0_23A5286i_Restore.ipsw
+  # [2]: https://download.developer.apple.com/WWDC_2023/macOS_14_Beta_Restore_Images/UniversalMac_14.0_23A5286i_Restore.ipsw
+  from_ipsw    = "https://updates.cdn-apple.com/2023SummerSeed/fullrestores/042-13887/3B4075C1-B695-49EA-82D9-4B720699D341/UniversalMac_14.0_23A5286i_Restore.ipsw"
+  vm_name      = "sonoma-vanilla"
+  cpu_count    = 4
+  memory_gb    = 8
+  disk_size_gb = 40
+  ssh_password = "admin"
+  ssh_username = "admin"
+  ssh_timeout  = "120s"
+  boot_command = [
+    # hello, hola, bonjour, etc.
+    "<wait60s><spacebar>",
+    # Language
+    "<wait30s>english<enter>",
+    # Select Your Country and Region
+    "<wait30s>united states<leftShiftOn><tab><leftShiftOff><spacebar>",
+    # Written and Spoken Languages
+    "<wait10s><leftShiftOn><tab><leftShiftOff><spacebar>",
+    # Accessibility
+    "<wait10s><leftShiftOn><tab><leftShiftOff><spacebar>",
+    # Data & Privacy
+    "<wait10s><leftShiftOn><tab><leftShiftOff><spacebar>",
+    # Migration Assistant
+    "<wait10s><tab><tab><tab><spacebar>",
+    # Sign In with Your Apple ID
+    "<wait10s><leftShiftOn><tab><leftShiftOff><leftShiftOn><tab><leftShiftOff><spacebar>",
+    # Are you sure you want to skip signing in with an Apple ID?
+    "<wait10s><tab><spacebar>",
+    # Terms and Conditions
+    "<wait10s><leftShiftOn><tab><leftShiftOff><spacebar>",
+    # I have read and agree to the macOS Software License Agreement
+    "<wait10s><tab><spacebar>",
+    # Create a Computer Account
+    "<wait10s>admin<tab><tab>admin<tab>admin<tab><tab><tab><spacebar>",
+    # Enable Location Services
+    "<wait30s><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>",
+    # Screen Time
+    "<wait10s><tab><spacebar>",
+    # Siri
+    "<wait10s><tab><spacebar><leftShiftOn><tab><leftShiftOff><spacebar>",
+    # Choose Your Look
+    "<wait10s><leftShiftOn><tab><leftShiftOff><spacebar>",
+    # Enable Voice Over
+    "<wait10s><leftAltOn><f5><leftAltOff><wait5s>v",
+    # Now that the installation is done, open "System Settings"
+    "<wait10s><leftAltOn><spacebar><leftAltOff>System Settings<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>",
+    # Open "Remote Login" details
+    "<wait10s><tab><spacebar>",
+    # Enable "Full Disk Access"
+    "<wait10s><tab><spacebar>",
+    # Click "Done"
+    "<wait10s><leftShiftOn><tab><leftShiftOff><leftShiftOn><tab><leftShiftOff><spacebar>",
+    # Disable Voice Over
+    "<leftAltOn><f5><leftAltOff>",
+  ]
+
+  // A (hopefully) temporary workaround for Virtualization.Framework's
+  // installation process not fully finishing in a timely manner
+  create_grace_time = "30s"
+}
+
+build {
+  sources = ["source.tart-cli.tart"]
+
+  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\"",
+      // Enable auto-login
+      //
+      // See https://github.com/xfreebird/kcpassword for details.
+      "echo '00000000: 1ced 3f4a bcbc ba2c caca 4e82' | sudo xxd -r - /etc/kcpassword",
+      "sudo defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser admin",
+      // Disable screensaver at login screen
+      "sudo defaults write /Library/Preferences/com.apple.screensaver loginWindowIdleTime 0",
+      // Disable screensaver for admin user
+      "defaults -currentHost write com.apple.screensaver idleTime 0",
+      // Prevent the VM from sleeping
+      "sudo systemsetup -setdisplaysleep Off",
+      "sudo systemsetup -setsleep Off",
+      "sudo systemsetup -setcomputersleep Off",
+      // Launch Safari to populate the defaults
+      "/Applications/Safari.app/Contents/MacOS/Safari &",
+      "sleep 30",
+      "kill -9 %1",
+      // Enable Safari's remote automation and "Develop" menu
+      "sudo safaridriver --enable",
+      "defaults write com.apple.Safari.SandboxBroker ShowDevelopMenu -bool true",
+      "defaults write com.apple.Safari IncludeDevelopMenu -bool true",
+      // Disable screen lock
+      //
+      // Note that this only works if the user is logged-in,
+      // i.e. not on login screen.
+      "sysadminctl -screenLock off -password admin",
+    ]
+  }
+}

templates/vanilla-ventura.pkr.hcl

@@ -1,7 +1,7 @@
 packer {
   required_plugins {
     tart = {
-      version = ">= 0.5.4"
+      version = ">= 1.2.0"
       source  = "github.com/cirruslabs/tart"
     }
   }
@@ -10,7 +10,7 @@ packer {
 source "tart-cli" "tart" {
   # You can find macOS IPSW URLs on various websites like https://ipsw.me/
   # and https://www.theiphonewiki.com/wiki/Beta_Firmware/Mac/13.x
-  from_ipsw    = "https://updates.cdn-apple.com/2023WinterFCS/fullrestores/032-66602/418BC37A-FCD9-400A-B4FA-022A19576CD4/UniversalMac_13.3.1_22E261_Restore.ipsw"
+  from_ipsw    = "https://updates.cdn-apple.com/2023SpringFCS/fullrestores/032-84884/F97A22EE-9B5E-4FD5-94C1-B39DCEE8D80F/UniversalMac_13.4_22F66_Restore.ipsw"
   vm_name      = "ventura-vanilla"
   cpu_count    = 4
   memory_gb    = 8
@@ -96,6 +96,8 @@ build {
       "sudo defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser admin",
       // Disable screensaver at login screen
       "sudo defaults write /Library/Preferences/com.apple.screensaver loginWindowIdleTime 0",
+      // Disable screensaver for admin user
+      "defaults -currentHost write com.apple.screensaver idleTime 0",
       // Prevent the VM from sleeping
       "sudo systemsetup -setdisplaysleep Off",
       "sudo systemsetup -setsleep Off",

templates/xcode.pkr.hcl

@@ -1,26 +1,26 @@
 packer {
   required_plugins {
     tart = {
-      version = ">= 0.5.4"
+      version = ">= 1.2.0"
       source  = "github.com/cirruslabs/tart"
     }
   }
 }
 
 variable "macos_version" {
-  type =  string
+  type = string
 }
 
 variable "xcode_version" {
-  type =  string
+  type = string
 }
 
 variable "gha_version" {
-  type =  string
+  type = string
 }
 
 variable "android_sdk_tools_version" {
-  type =  string
+  type    = string
   default = "9477386" # https://developer.android.com/studio/#command-tools
 }
 
@@ -65,7 +65,7 @@ build {
   provisioner "shell" {
     inline = [
       "source ~/.zprofile",
-      "brew install homebrew/cask-versions/temurin11",
+      "brew install homebrew/cask-versions/temurin17",
       "echo 'export ANDROID_HOME=$HOME/android-sdk' >> ~/.zprofile",
       "echo 'export ANDROID_SDK_ROOT=$ANDROID_HOME' >> ~/.zprofile",
       "echo 'export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/emulator' >> ~/.zprofile",
@@ -76,7 +76,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;33.0.1' 'ndk;25.1.8937393'"
+      "yes | sdkmanager 'platform-tools' 'platforms;android-33' 'build-tools;34.0.0' 'ndk;25.2.9519653'"
     ]
   }
   provisioner "shell" {
@@ -126,8 +126,8 @@ build {
   provisioner "shell" {
     inline = [
       "source ~/.zprofile",
-      "brew install graphicsmagick",
-      "brew install wix/brew/applesimutils",
+      "brew install graphicsmagick imagemagick",
+      "brew install wix/brew/applesimutils"
     ]
   }
 
@@ -138,17 +138,18 @@ build {
       "sudo security delete-certificate -Z FF6797793A3CD798DC5B2ABEF56F73EDC9F83A64 /Library/Keychains/System.keychain",
       "curl -o add-certificate.swift https://raw.githubusercontent.com/actions/runner-images/fb3b6fd69957772c1596848e2daaec69eabca1bb/images/macos/provision/configuration/add-certificate.swift",
       "swiftc add-certificate.swift",
+      "sudo mv ./add-certificate /usr/local/bin/add-certificate",
       "curl -o AppleWWDRCAG3.cer https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer",
       "curl -o DeveloperIDG2CA.cer https://www.apple.com/certificateauthority/DeveloperIDG2CA.cer",
-      "sudo ./add-certificate AppleWWDRCAG3.cer",
-      "sudo ./add-certificate DeveloperIDG2CA.cer",
+      "sudo add-certificate AppleWWDRCAG3.cer",
+      "sudo add-certificate DeveloperIDG2CA.cer",
       "rm add-certificate* *.cer"
     ]
   }
+
   provisioner "shell" {
     inline = [
       "source ~/.zprofile",
-      "brew doctor",
       "flutter doctor"
     ]
   }

variables.pkrvars.hcl

@@ -1,3 +1,3 @@
 macos_version = "ventura"
-gha_version   = "2.303.0"
-xcode_version = "14.3"
+gha_version   = "2.307.1"
+xcode_version = "14.3.1"