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

.cirrus.yml

@@ -62,12 +62,12 @@ 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
@@ -95,7 +95,7 @@ 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:

DEVELOPMENT.md

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

README.md

@@ -24,7 +24,7 @@ monthly on the first Saturday of the month:
 
 * `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.4,15.3,15.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.

templates/base.pkr.hcl

@@ -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 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"
-    ]
-  }
 }

templates/disable-sip.pkr.hcl

@@ -1,7 +1,7 @@
 packer {
   required_plugins {
     tart = {
-      version = ">= 1.12.0"
+      version = ">= 1.2.0"
       source  = "github.com/cirruslabs/tart"
     }
   }

templates/vanilla-sonoma.pkr.hcl

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

templates/vanilla-ventura.pkr.hcl

@@ -1,7 +1,7 @@
 packer {
   required_plugins {
     tart = {
-      version = ">= 1.12.0"
+      version = ">= 1.2.0"
       source  = "github.com/cirruslabs/tart"
     }
   }

templates/xcode.pkr.hcl

@@ -1,7 +1,7 @@
 packer {
   required_plugins {
     tart = {
-      version = ">= 1.12.0"
+      version = ">= 1.2.0"
       source  = "github.com/cirruslabs/tart"
     }
   }
@@ -52,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"
     ]
   }
 
@@ -60,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",
@@ -104,7 +98,7 @@ build {
   provisioner "shell" {
     inline = [
       for version in var.xcode_version :
-      "source ~/.zprofile && sudo xcodes install ${version} --experimental-unxip --path /Users/admin/Downloads/Xcode_${version}.xip --select --empty-trash && xcodebuild -downloadAllPlatforms && xcodebuild -runFirstLaunch"
+      "source ~/.zprofile && xcodes install ${version} --experimental-unxip --path /Users/admin/Downloads/Xcode_${version}.xip --select --empty-trash && xcodebuild -downloadAllPlatforms && xcodebuild -runFirstLaunch"
     ]
   }
 
@@ -126,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"
     ]
   }
@@ -165,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 15000 ]] && 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"
     ]
   }
 }