From 2a0a476e3bc6ea2a530971c7e3f5aed2136fa012 Mon Sep 17 00:00:00 2001 From: fedor Date: Mon, 28 Oct 2024 09:19:43 -0700 Subject: [PATCH] Sequoia 15.1 --- .ci/cirrus.vanilla.yml | 17 +--- templates/vanilla-sequoia-beta.pkr.hcl | 121 ------------------------- templates/vanilla-sequoia.pkr.hcl | 2 +- 3 files changed, 2 insertions(+), 138 deletions(-) delete mode 100644 templates/vanilla-sequoia-beta.pkr.hcl diff --git a/.ci/cirrus.vanilla.yml b/.ci/cirrus.vanilla.yml index d5b5045..64e51e5 100644 --- a/.ci/cirrus.vanilla.yml +++ b/.ci/cirrus.vanilla.yml @@ -23,22 +23,7 @@ task: disable_sip_script: - packer build -var vm_name=sequoia-vanilla templates/disable-sip.pkr.hcl push_script: - - tart push sequoia-vanilla ghcr.io/cirruslabs/macos-sequoia-vanilla:latest ghcr.io/cirruslabs/macos-sequoia-vanilla:15.0.1 - always: - cleanup_script: - - tart delete sequoia-vanilla - -task: - name: "Update Vanilla Sequoia Beta Image" - only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH && changesInclude("templates/vanilla-sequoia-beta.pkr.hcl") - <<: *defaults - build_script: - - packer init templates/vanilla-sequoia-beta.pkr.hcl - - packer build templates/vanilla-sequoia-beta.pkr.hcl - disable_sip_script: - - packer build -var vm_name=sequoia-vanilla templates/disable-sip.pkr.hcl - push_script: - - tart push sequoia-vanilla ghcr.io/cirruslabs/macos-sequoia-vanilla:15.1-rc ghcr.io/cirruslabs/macos-sequoia-vanilla:15.1 + - tart push sequoia-vanilla ghcr.io/cirruslabs/macos-sequoia-vanilla:latest ghcr.io/cirruslabs/macos-sequoia-vanilla:15.1 always: cleanup_script: - tart delete sequoia-vanilla diff --git a/templates/vanilla-sequoia-beta.pkr.hcl b/templates/vanilla-sequoia-beta.pkr.hcl deleted file mode 100644 index b446392..0000000 --- a/templates/vanilla-sequoia-beta.pkr.hcl +++ /dev/null @@ -1,121 +0,0 @@ -packer { - required_plugins { - tart = { - version = ">= 1.12.0" - source = "github.com/cirruslabs/tart" - } - } -} - -source "tart-cli" "tart" { - from_ipsw = "https://updates.cdn-apple.com/2024FallFCS/fullrestores/062-24344/4BBFA6BD-C58F-4C82-B793-6ECA98024379/UniversalMac_15.1_24B82_Restore.ipsw" - vm_name = "sequoia-vanilla" - cpu_count = 4 - memory_gb = 8 - disk_size_gb = 40 - ssh_password = "admin" - ssh_username = "admin" - ssh_timeout = "300s" - boot_command = [ - # hello, hola, bonjour, etc. - "", - # 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 🤷 - "italianoenglish", - # Select Your Country and Region - "united states", - # Written and Spoken Languages - "", - # Accessibility - "", - # Data & Privacy - "", - # Migration Assistant - "", - # Sign In with Your Apple ID - "", - # Are you sure you want to skip signing in with an Apple ID? - "", - # Terms and Conditions - "", - # I have read and agree to the macOS Software License Agreement - "", - # Create a Computer Account - "adminadminadmin", - # Enable Location Services - "", - # Are you sure you don't want to use Location Services? - "", - # Select Your Time Zone - "UTC", - # Analytics - "", - # Screen Time - "", - # Siri - "", - # Choose Your Look - "", - # Welcome to Mac - "", - # Enable Keyboard navigation - # This is so that we can navigate the System Settings app using the keyboard - "Terminal", - "defaults write NSGlobalDomain AppleKeyboardUIMode -int 3", - "q", - # Now that the installation is done, open "System Settings" - "System Settings", - # Navigate to "Sharing" - "fsharing", - # Navigate to "Screen Sharing" and enable it - "", - # Navigate to "Remote Login" and enable it - "", - # Quit System Settings - "q", - ] - - // 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 -setsleep Off 2>/dev/null", - // Launch Safari to populate the defaults - "/Applications/Safari.app/Contents/MacOS/Safari &", - "SAFARI_PID=$!", - "disown", - "sleep 30", - "kill -9 $SAFARI_PID", - // Enable Safari's remote automation - "sudo safaridriver --enable", - // 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", - ] - } -} diff --git a/templates/vanilla-sequoia.pkr.hcl b/templates/vanilla-sequoia.pkr.hcl index 2662abe..61f90c7 100644 --- a/templates/vanilla-sequoia.pkr.hcl +++ b/templates/vanilla-sequoia.pkr.hcl @@ -8,7 +8,7 @@ packer { } source "tart-cli" "tart" { - from_ipsw = "https://updates.cdn-apple.com/2024FallFCS/fullrestores/072-01423/566E5B4E-1100-4643-91B3-131247351844/UniversalMac_15.0.1_24A348_Restore.ipsw" + from_ipsw = "https://updates.cdn-apple.com/2024FallFCS/fullrestores/072-12340/78D28AC4-CCFC-45D2-BD27-1E5D915E43F9/UniversalMac_15.1_24B83_Restore.ipsw" vm_name = "sequoia-vanilla" cpu_count = 4 memory_gb = 8