Hide useless systemsetup errors and avoid scary Safari kill error

.cirrus.yml

@@ -1,37 +1,16 @@
-persistent_worker:
-  labels:
-    name: dev-mini
-
-env:
-  TART_REGISTRY_HOSTNAME: ghcr.io
-  TART_REGISTRY_USERNAME: fkorotkov # GitHub supports only PATs
-  TART_REGISTRY_PASSWORD: ENCRYPTED[!82ed873afdf627284305afef4958c85a8f73127b09978a9786ac521559630ea6c9a5ab6e7f8315abf9ead09b6eff6eae!]
-  AWS_ACCESS_KEY_ID: ENCRYPTED[c187b670a17eead88c1698849376273991d09678efe37ae2f0c9738c27a2422741a71c501ef4b6a4df7bff3eca5213a9]
-  AWS_SECRET_ACCESS_KEY: ENCRYPTED[e456254a53b82e3167f2da23e24c389620cb3f7d47e4e5e7d993813bf9bb18c784d5cb8d88d19632073acc9e1f6096c9]
-
 task:
-  name: "Update Vanilla Images"
+  name: "Update Images"
-  only_if: false
-  timeout_in: 3h
-  update_script: brew update && brew upgrade
-  info_script:
-    - tart --version
-    - packer --version
-  build_script:
-    - packer init templates/vanilla-sonoma.pkr.hcl
-    - packer build templates/vanilla-sonoma.pkr.hcl
-  disable_sip_script:
-    - packer build -var vm_name=sonoma-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.1
-  always:
-    cleanup_script:
-      - tart delete sonoma-vanilla || true
-
-task:
-  name: "Update Non-Vanilla Images"
   only_if: $CIRRUS_CRON != ""
   timeout_in: 3h
+  persistent_worker:
+    labels:
+      name: dev-mini
+  env:
+    TART_REGISTRY_HOSTNAME: ghcr.io
+    TART_REGISTRY_USERNAME: fkorotkov # GitHub supports only PATs
+    TART_REGISTRY_PASSWORD: ENCRYPTED[!82ed873afdf627284305afef4958c85a8f73127b09978a9786ac521559630ea6c9a5ab6e7f8315abf9ead09b6eff6eae!]
+    AWS_ACCESS_KEY_ID: ENCRYPTED[c187b670a17eead88c1698849376273991d09678efe37ae2f0c9738c27a2422741a71c501ef4b6a4df7bff3eca5213a9]
+    AWS_SECRET_ACCESS_KEY: ENCRYPTED[e456254a53b82e3167f2da23e24c389620cb3f7d47e4e5e7d993813bf9bb18c784d5cb8d88d19632073acc9e1f6096c9]
   update_script: brew update && brew upgrade
   info_script:
     - tart --version
@@ -49,9 +28,9 @@ task:
   push_xcode_script:
     - tart push sonoma-xcode:$XCODE_VERSION ghcr.io/cirruslabs/macos-sonoma-xcode:$XCODE_VERSION ghcr.io/cirruslabs/macos-sonoma-xcode:latest
   push_base_ecr_script:
-    - tart push sonoma-base public.ecr.aws/cirruslabs/macos:sonoma-base
+    - tart push --chunk-size=5 sonoma-base public.ecr.aws/cirruslabs/macos:sonoma-base
   push_xcode_ecr_script:
-    - tart push sonoma-xcode:$XCODE_VERSION public.ecr.aws/cirruslabs/macos:sonoma-xcode-$XCODE_VERSION public.ecr.aws/cirruslabs/macos:sonoma-xcode
+    - tart push --chunk-size=5 sonoma-xcode:$XCODE_VERSION public.ecr.aws/cirruslabs/macos:sonoma-xcode-$XCODE_VERSION public.ecr.aws/cirruslabs/macos:sonoma-xcode
   always:
     cleanup_script:
       - tart delete sonoma-base || true
@@ -61,6 +40,15 @@ task:
   name: "Release Xcode $CIRRUS_TAG"
   only_if: $CIRRUS_TAG != ""
   timeout_in: 3h
+  persistent_worker:
+    labels:
+      name: dev-mini
+  env:
+    TART_REGISTRY_HOSTNAME: ghcr.io
+    TART_REGISTRY_USERNAME: fkorotkov # GitHub supports only PATs
+    TART_REGISTRY_PASSWORD: ENCRYPTED[!82ed873afdf627284305afef4958c85a8f73127b09978a9786ac521559630ea6c9a5ab6e7f8315abf9ead09b6eff6eae!]
+    AWS_ACCESS_KEY_ID: ENCRYPTED[c187b670a17eead88c1698849376273991d09678efe37ae2f0c9738c27a2422741a71c501ef4b6a4df7bff3eca5213a9]
+    AWS_SECRET_ACCESS_KEY: ENCRYPTED[e456254a53b82e3167f2da23e24c389620cb3f7d47e4e5e7d993813bf9bb18c784d5cb8d88d19632073acc9e1f6096c9]
   update_script: brew update && brew upgrade
   info_script:
     - tart --version
@@ -81,9 +69,9 @@ task:
   push_ecr_script: |
     if [[ $CIRRUS_TAG == *"beta"* ]]
     then
-      tart push sonoma-xcode:$CIRRUS_TAG public.ecr.aws/cirruslabs/macos:sonoma-xcode-$CIRRUS_TAG
+      tart push  --chunk-size=5 sonoma-xcode:$CIRRUS_TAG public.ecr.aws/cirruslabs/macos:sonoma-xcode-$CIRRUS_TAG
     else
-      tart push sonoma-xcode:$CIRRUS_TAG public.ecr.aws/cirruslabs/macos:sonoma-xcode-$CIRRUS_TAG public.ecr.aws/cirruslabs/macos:sonoma-xcode
+      tart push  --chunk-size=5 sonoma-xcode:$CIRRUS_TAG public.ecr.aws/cirruslabs/macos:sonoma-xcode-$CIRRUS_TAG public.ecr.aws/cirruslabs/macos:sonoma-xcode
     fi
   always:
     cleanup_script:

templates/disable-sip.pkr.hcl

@@ -22,8 +22,11 @@ source "tart-cli" "tart" {
     # Skip over "Macintosh" and select "Options"
     # to boot into macOS Recovery
     "<wait60s><right><right><enter>",
+    # Select default language
+    "<wait10s><enter>",
     # Open Terminal
-    "<wait10s><leftAltOn>T<leftAltOff>",
+    "<wait10s><leftCtrlOn><f2><leftCtrlOff>",
+    "<right><right><right><right><down><down><down><enter>",
     # Disable SIP
     "<wait10s>csrutil disable<enter>",
     "<wait10s>y<enter>",

templates/vanilla-sonoma.pkr.hcl

@@ -19,14 +19,8 @@ source "tart-cli" "tart" {
   boot_command = [
     # hello, hola, bonjour, etc.
     "<wait60s><spacebar>",
-    # Language: most of the times we have a list of "English"[1], "English (UK)", etc. with
+    # Language
-    # "English" language already selected. If we type "english", it'll cause us to switch
+    "<wait30s>english<enter>",
-    # to the "English (UK)", which is not what we want. To solve this, we switch to some other
-    # language first, e.g. "Italiano" and then switch back to "English". We'll then jump to the
-    # first entry in a list of "english"-prefixed items, which will be "English".
-    #
-    # [1]: should be named "English (US)", but oh well 🤷
-    "<wait30s>italiano<esc>english<enter>",
     # Select Your Country and Region
     "<wait30s>united states<leftShiftOn><tab><leftShiftOff><spacebar>",
     # Written and Spoken Languages

templates/vanilla-ventura.pkr.hcl

@@ -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/2023FallFCS/fullrestores/042-55833/C0830847-A2F8-458F-B680-967991820931/UniversalMac_13.6_22G120_Restore.ipsw"
+  from_ipsw    = "https://updates.cdn-apple.com/2023SummerFCS/fullrestores/042-43686/945D434B-DA5D-48DB-A558-F6D18D11AD69/UniversalMac_13.5.2_22G91_Restore.ipsw"
   vm_name      = "ventura-vanilla"
   cpu_count    = 4
   memory_gb    = 8