Update variables.pkrvars.hcl

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

.cirrus.yml

@@ -46,7 +46,6 @@ task:
     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

@@ -16,7 +16,7 @@ variable "gha_version" {
 }
 
 source "tart-cli" "tart" {
-  vm_base_name = "ghcr.io/cirruslabs/macos-${var.macos_version}-vanilla:13.4"
+  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 = [
@@ -112,6 +105,7 @@ build {
   }
   provisioner "shell" {
     inline = [
+      "source ~/.zprofile",
       "brew install awscli"
     ]
   }

templates/vanilla-monterey.pkr.hcl

@@ -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

@@ -11,9 +11,9 @@ 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/032-94355/CBE8CBE1-750D-487E-A393-B90FEF60CEBA/UniversalMac_14.0_23A5257q_Restore.ipsw
-  # [2]: https://download.developer.apple.com/WWDC_2023/macOS_14_Beta_Restore_Images/UniversalMac_14.0_23A5257q_Restore.ipsw
-  from_ipsw    = "https://updates.cdn-apple.com/2023SummerSeed/fullrestores/032-94355/CBE8CBE1-750D-487E-A393-B90FEF60CEBA/UniversalMac_14.0_23A5257q_Restore.ipsw"
+  # [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
@@ -99,6 +99,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-ventura.pkr.hcl

@@ -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

@@ -8,19 +8,19 @@ packer {
 }
 
 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" {
@@ -138,13 +138,15 @@ 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",

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"