Disable SIP in vanilla images

.cirrus.yml: introduce "Update Vanilla Images" task (#108 )
Don't mistakenly select "English (UK)" language instead of "English" one (#107 )
2026-09-30 20:01:18 +02:00 · 2023-12-20 18:31:58 +04:00 · 2023-12-20 15:11:26 +01:00 · 2023-12-19 12:12:17 +04:00 · 2023-12-15 11:14:20 +04:00
4 changed files with 58 additions and 34 deletions
@@ -1,16 +1,37 @@
+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 Images"
+  name: "Update Vanilla 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
+  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
@@ -40,15 +61,6 @@ 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
@@ -93,13 +93,15 @@ build {
      // 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",
+      "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 &",
-      "sleep 3",
-      "kill -9 %1",
+      "SAFARI_PID=$!",
+      "disown",
+      "sleep 30",
+      "kill -9 $SAFARI_PID",
      // Enable Safari's remote automation and "Develop" menu
      "sudo safaridriver --enable",
      "defaults write com.apple.Safari.SandboxBroker ShowDevelopMenu -bool true",
@@ -19,8 +19,14 @@ source "tart-cli" "tart" {
  boot_command = [
    # hello, hola, bonjour, etc.
    "<wait60s><spacebar>",
-    # Language
-    "<wait30s>english<enter>",
+    # Language: most of the times we have a list of "English"[1], "English (UK)", etc. with
+    # "English" language already selected. If we type "english", it'll cause us to switch
+    # 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
@@ -97,13 +103,15 @@ build {
      // 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",
+      "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=$!",
+      "disown",
      "sleep 30",
-      "kill -9 %1",
+      "kill -9 $SAFARI_PID",
      // Enable Safari's remote automation and "Develop" menu
      "sudo safaridriver --enable",
      "defaults write com.apple.Safari.SandboxBroker ShowDevelopMenu -bool true",
@@ -99,13 +99,15 @@ build {
      // 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",
+      "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=$!",
+      "disown",
      "sleep 30",
-      "kill -9 %1",
+      "kill -9 $SAFARI_PID",
      // Enable Safari's remote automation and "Develop" menu
      "sudo safaridriver --enable",
      "defaults write com.apple.Safari.SandboxBroker ShowDevelopMenu -bool true",
Author	SHA1	Message	Date
Nikolay Edigaryev	7ccd3e62e7	Disable SIP in vanilla images	2023-12-20 18:31:58 +04:00
Nikolay Edigaryev	e5f5edca05	.cirrus.yml: introduce "Update Vanilla Images" task (#108 )	2023-12-20 15:11:26 +01:00
Nikolay Edigaryev	21522999bb	Don't mistakenly select "English (UK)" language instead of "English" one (#107 )	2023-12-19 12:12:17 +04:00
Nikolay Edigaryev	664d47260e	Hide useless systemsetup errors and avoid scary Safari kill error (#106 )	2023-12-15 11:14:20 +04:00