/Users/runner → /Users/admin symlink to support certain GitHub Actions

2026-09-30 03:42:04 +02:00 · 2024-04-22 19:02:29 +04:00
9 changed files with 45 additions and 231 deletions
@@ -21,7 +21,7 @@ defaults: &defaults
    - packer --version

 task:
-  name: "Update Vanilla Sonoma Image"
+  name: "Update Vanilla Images"
  only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH && changesInclude("templates/vanilla-sonoma.pkr.hcl")
  <<: *defaults
  build_script:
@@ -30,35 +30,18 @@ task:
  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.5
+    - tart push sonoma-vanilla ghcr.io/cirruslabs/macos-sonoma-vanilla:latest ghcr.io/cirruslabs/macos-sonoma-vanilla:14.4.1
  always:
    cleanup_script:
      - tart delete sonoma-vanilla

-task:
-  name: "Update Vanilla Sequoia Image"
-  persistent_worker:
-    labels:
-      name: dev-mini-experimental
-  only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH && changesInclude("templates/vanilla-sequoia.pkr.hcl")
-  <<: *defaults
-  build_script:
-    - packer init templates/vanilla-sequoia.pkr.hcl
-    - packer build templates/vanilla-sequoia.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:latest ghcr.io/cirruslabs/macos-sequoia-vanilla:15.0 ghcr.io/cirruslabs/macos-sequoia-vanilla:15.0-beta-2
-  always:
-    cleanup_script:
-      - tart delete sequoia-vanilla
-
 task:
  name: "Update Base Images ($MACOS_VERSION)"
  alias: update-base
-  matrix:
-    - env:
-        MACOS_VERSION: sonoma
+  env:
+    matrix:
+      MACOS_VERSION: sonoma
+      MACOS_VERSION: ventura
  only_if: $CIRRUS_CRON == "monthly"
  <<: *defaults
  pull_vanilla_script:
@@ -79,12 +62,17 @@ task:
  env:
    matrix:
      - MACOS_VERSION: sonoma
-        XCODE_VERSION: 15.4
+        XCODE_VERSION: 15.3
        LATEST: true
-      - MACOS_VERSION: sonoma
-        XCODE_VERSION: 15.3
      - MACOS_VERSION: sonoma
        XCODE_VERSION: 15.2
+      - MACOS_VERSION: sonoma
+        XCODE_VERSION: 15.1
+      - MACOS_VERSION: ventura
+        XCODE_VERSION: 14.3.1
+        LATEST: true
+      - MACOS_VERSION: ventura
+        XCODE_VERSION: 14.2
  <<: *defaults
  pull_base_script:
    - tart pull ghcr.io/cirruslabs/macos-$MACOS_VERSION-base:latest
@@ -107,14 +95,14 @@ task:
  env:
    matrix:
      - MACOS_VERSION: sonoma
-        XCODE_VERSIONS: 15.2,15.3,15.4
+        XCODE_VERSIONS: 15.1,15.2,15.3
  only_if: $CIRRUS_TAG != "" || $CIRRUS_CRON == "weekly" # Every Sunday at 14 UTC
  <<: *defaults
  pull_base_script:
    - tart pull ghcr.io/cirruslabs/macos-$MACOS_VERSION-base:latest
  build_xcode_script:
    - packer init templates/xcode.pkr.hcl
-    - packer build -var tag=runner -var disk_size=250 -var disk_free_mb=100000 -var macos_version="$MACOS_VERSION" -var xcode_version="[$XCODE_VERSIONS]" templates/xcode.pkr.hcl
+    - packer build -var tag=runner -var disk_size=130 -var macos_version="$MACOS_VERSION" -var xcode_version="[$XCODE_VERSIONS]" templates/xcode.pkr.hcl
  push_script: |
    tart push "$MACOS_VERSION-xcode:runner" ghcr.io/cirruslabs/macos-runner:$MACOS_VERSION
  always:
@@ -122,11 +110,10 @@ task:
      - tart delete "$MACOS_VERSION-xcode:runner"

 task:
-  name: "Release Xcode $CIRRUS_TAG ($MACOS_VERSION)"
+  name: "Release Xcode $CIRRUS_TAG"
  only_if: $CIRRUS_TAG != ""
-  matrix:
-    - env:
-        MACOS_VERSION: sonoma
+  env:
+    MACOS_VERSION: sonoma
  <<: *defaults
  pull_base_script:
    - tart pull ghcr.io/cirruslabs/macos-$MACOS_VERSION-base:latest
@@ -21,5 +21,5 @@ packer build -var macos_version=sonoma templates/base.pkr.hcl
 ## Building Xcode Image

 ```bash
-packer build -var macos_version=sonoma -var xcode_version="[15.4]" templates/xcode.pkr.hcl
+packer build -var macos_version=sonoma -var xcode_version=15.3 templates/xcode.pkr.hcl
 ```
@@ -5,8 +5,8 @@ Repository with Packer templates to build macOS [Tart](https://tart.app/) virtua

 The following image variants are currently available:

-* `macos-{sequoia,sonoma}-base` image has only `brew` pre-installed and the latest version of `macOS` available
-* `macos-{sequoia,sonoma}-xcode:N` image is based on `macos-{sequoia,sonoma}-base` image and has `Xcode N` with [`Flutter`](https://flutter.dev/) pre-installed
+* `macos-{ventura,sonoma}-base` image has only `brew` pre-installed and the latest version of `macOS` available
+* `macos-{ventura,sonoma}-xcode:N` image is based on `macos-{monterey,ventura}-base` image and has `Xcode N` with [`Flutter`](https://flutter.dev/) pre-installed
 * `macos-runner:sonoma` image is a variant of `xcode:N` with 3 latest versions of `Xcode` pre-installed and [`xcodes` tool](https://github.com/XcodesOrg/xcodes) to switch between them.

 See a full list of VMs available [here](https://github.com/orgs/cirruslabs/packages?tab=packages&q=macos-).
@@ -14,7 +14,7 @@ See a full list of VMs available [here](https://github.com/orgs/cirruslabs/packa
 ## Release Cadence

 Once a new version of Xcode is released, we will initiate a GitHub release which will automatically build and push
-a new version of the `macos-{sequoia,sonoma}-xcode:N` image as well as `macos-runner:sonoma`. This generally happens within 24 hours
+a new version of the `macos-sonoma-xcode:N` image as well as `macos-runner:sonoma`. This generally happens within 24 hours
 of a release. Please watch this repository releases to get notified about new images.

 ## Update Cadence
@@ -22,9 +22,9 @@ of a release. Please watch this repository releases to get notified about new im
 Some of the images are regularly getting rebuild in order to update the pre-installed packages. The following images are updated
 monthly on the first Saturday of the month:

-* `ghcr.io/cirruslabs/macos-{sequoia,sonoma}-base`
-* `ghcr.io/cirruslabs/macos-sonoma-xcode:{16-beta,latest,15.4,15.3,15.2}`
-* `ghcr.io/cirruslabs/macos-sequoia-xcode:{16-beta}`
+* `ghcr.io/cirruslabs/macos-{ventura,sonoma}-base`
+* `ghcr.io/cirruslabs/macos-ventura-xcode:{latest,14.3.1,14.2}`
+* `ghcr.io/cirruslabs/macos-sonoma-xcode:{latest,15.3,15.2,15.1}`

 Note that `ghcr.io/cirruslabs/macos-runner:sonoma` is updated every Sunday and this image is [optimised for startup](https://cirrus-runners.app/blog/2024/04/11/optimizing-startup-time-of-cirrus-runners/)
 on Cirrus Runners and Cirrus CI services.
@@ -1,7 +1,7 @@
 packer {
  required_plugins {
    tart = {
-      version = ">= 1.12.0"
+      version = ">= 1.2.0"
      source  = "github.com/cirruslabs/tart"
    }
  }
@@ -59,10 +59,8 @@ build {
      "source ~/.zprofile",
      "brew --version",
      "brew update",
-      "brew install curl wget unzip zip ca-certificates cmake gcc git-lfs jq yq gh gitlab-runner",
-      "brew install --cask git-credential-manager",
+      "brew install wget cmake gcc git-lfs jq gh gitlab-runner",
      "git lfs install",
-      "sudo softwareupdate --install-rosetta --agree-to-license"
    ]
  }

@@ -98,8 +96,6 @@ build {
    inline = [
      "source ~/.zprofile",
      "brew install node@20",
-      "echo 'export PATH=\"/opt/homebrew/opt/node@20/bin:$PATH\"' >> ~/.zprofile",
-      "source ~/.zprofile",
      "node --version",
      "npm install --global yarn",
      "yarn --version",
@@ -121,12 +117,4 @@ build {
  provisioner "shell" {
    script = "scripts/automationmodetool.expect"
  }
-
-  // some other health checks
-  provisioner "shell" {
-    inline = [
-      "source ~/.zprofile",
-      "test -d /Users/runner"
-    ]
-  }
 }
@@ -1,7 +1,7 @@
 packer {
  required_plugins {
    tart = {
-      version = ">= 1.12.0"
+      version = ">= 1.2.0"
      source  = "github.com/cirruslabs/tart"
    }
  }
@@ -1,120 +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/2024SummerSeed/fullrestores/062-22022/AB066FFB-B7FE-4132-83AC-E58A323805C1/UniversalMac_15.0_24A5279h_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.
-    "<wait60s><spacebar>",
-    # 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
-    "<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
-    "<wait120s><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>",
-    # Welcome to Mac
-    "<wait10s><tab><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>",
-    # 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 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 $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",
-    ]
-  }
-}
@@ -1,14 +1,14 @@
 packer {
  required_plugins {
    tart = {
-      version = ">= 1.12.0"
+      version = ">= 1.2.0"
      source  = "github.com/cirruslabs/tart"
    }
  }
 }

 source "tart-cli" "tart" {
-  from_ipsw    = "https://updates.cdn-apple.com/2024SpringFCS/fullrestores/062-01897/C874907B-9F82-4109-87EB-6B3C9BF1507D/UniversalMac_14.5_23F79_Restore.ipsw"
+  from_ipsw    = "https://updates.cdn-apple.com/2024WinterFCS/fullrestores/052-77579/4569734E-120C-4F31-AD08-FC1FF825D059/UniversalMac_14.4.1_23E224_Restore.ipsw"
  vm_name      = "sonoma-vanilla"
  cpu_count    = 4
  memory_gb    = 8
@@ -1,7 +1,7 @@
 packer {
  required_plugins {
    tart = {
-      version = ">= 1.12.0"
+      version = ">= 1.2.0"
      source  = "github.com/cirruslabs/tart"
    }
  }
@@ -1,7 +1,7 @@
 packer {
  required_plugins {
    tart = {
-      version = ">= 1.12.0"
+      version = ">= 1.2.0"
      source  = "github.com/cirruslabs/tart"
    }
  }
@@ -22,12 +22,7 @@ variable "tag" {

 variable "disk_size" {
  type = number
-  default = 100
-}
-
-variable "disk_free_mb" {
-  type = number
-  default = 15000
+  default = 90
 }

 variable "android_sdk_tools_version" {
@@ -48,26 +43,6 @@ source "tart-cli" "tart" {
  ssh_timeout  = "120s"
 }

-locals {
-  xcode_install_provisioners = [
-    for version in var.xcode_version : {
-      type = "shell"
-      inline = [
-        "source ~/.zprofile",
-        "sudo xcodes install ${version} --experimental-unxip --path /Users/admin/Downloads/Xcode_${version}.xip --select --empty-trash",
-        // get selected xcode path, strip /Contents/Developer and move to GitHub compatible locations
-        "INSTALLED_PATH=$(xcodes select -p)",
-        "CONTENTS_DIR=$(dirname $INSTALLED_PATH)",
-        "APP_DIR=$(dirname $CONTENTS_DIR)",
-        "sudo mv $APP_DIR /Applications/Xcode_${version}.app",
-        "sudo xcode-select -s /Applications/Xcode_${version}.app",
-        "xcodebuild -downloadAllPlatforms",
-        "xcodebuild -runFirstLaunch",
-      ]
-    }
-  ]
-}
-
 build {
  sources = ["source.tart-cli.tart"]

@@ -77,6 +52,8 @@ build {
      "brew --version",
      "brew update",
      "brew upgrade",
+      "brew install curl wget unzip zip ca-certificates",
+      "sudo softwareupdate --install-rosetta --agree-to-license"
    ]
  }

@@ -85,18 +62,10 @@ build {
    script = "scripts/install-actions-runner.sh"
  }

-  // make sure our workaround from base is still valid
-  provisioner "shell" {
-    inline = [
-      "sudo ln -s /Users/admin /Users/runner || true"
-    ]
-  }
-
  provisioner "shell" {
    inline = [
      "source ~/.zprofile",
-      "brew install openjdk@17",
-      "echo 'export PATH=\"/opt/homebrew/opt/openjdk@17/bin:$PATH\"' >> ~/.zprofile",
+      "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",
@@ -126,12 +95,11 @@ build {

  // iterate over all Xcode versions and install them
  // select the latest one as the default
-  dynamic "provisioner" {
-    for_each = local.xcode_install_provisioners
-    labels = ["shell"]
-    content {
-      inline = provisioner.value.inline
-    }
+  provisioner "shell" {
+    inline = [
+      for version in var.xcode_version :
+      "source ~/.zprofile && xcodes install ${version} --experimental-unxip --path /Users/admin/Downloads/Xcode_${version}.xip --select --empty-trash && xcodebuild -downloadAllPlatforms && xcodebuild -runFirstLaunch"
+    ]
  }

  provisioner "shell" {
@@ -152,10 +120,8 @@ build {
    inline = [
      "source ~/.zprofile",
      "brew install libimobiledevice ideviceinstaller ios-deploy fastlane carthage",
-      "brew install xcbeautify",
      "gem update",
      "gem install cocoapods",
-      "gem install xcpretty",
      "gem uninstall --ignore-dependencies ffi && gem install ffi -- --enable-libffi-alloc"
    ]
  }
@@ -173,6 +139,7 @@ build {
  provisioner "shell" {
    inline = [
      "source ~/.zprofile",
+      "sudo security delete-certificate -Z FF6797793A3CD798DC5B2ABEF56F73EDC9F83A64 /Library/Keychains/System.keychain",
      "curl -o AppleWWDRCAG3.cer https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer",
      "curl -o DeveloperIDG2CA.cer https://www.apple.com/certificateauthority/DeveloperIDG2CA.cer",
      "curl -o add-certificate.swift https://raw.githubusercontent.com/actions/runner-images/fb3b6fd69957772c1596848e2daaec69eabca1bb/images/macos/provision/configuration/add-certificate.swift",
@@ -190,21 +157,13 @@ build {
    ]
  }

-  // check there is at least 15GB of free space and fail if not
+  // check there is at least 20GB of free space and fail if not
  provisioner "shell" {
    inline = [
      "source ~/.zprofile",
      "df -h",
      "export FREE_MB=$(df -m | awk '{print $4}' | head -n 2 | tail -n 1)",
-      "[[ $FREE_MB -gt ${var.disk_free_mb} ]] && echo OK || exit 1"
-    ]
-  }
-
-  // some other health checks
-  provisioner "shell" {
-    inline = [
-      "source ~/.zprofile",
-      "test -d /Users/runner"
+      "[[ $FREE_MB -gt 20000 ]] && echo OK || exit 1"
    ]
  }
 }