Xcode 15.4 (#154 )

* Xcode 15.4 * Build runner on a release
macOS 14.5 (#153 )
2026-10-17 20:25:41 +02:00 · 2024-05-13 15:18:50 -04:00 · 2024-05-13 14:47:27 -04:00 · 2024-05-13 07:56:29 -04:00 · 2024-05-07 15:57:00 -04:00 · 2024-05-02 13:10:34 -04:00
8 changed files with 57 additions and 19 deletions
@@ -62,12 +62,12 @@ task:
  env:
    matrix:
      - MACOS_VERSION: sonoma
-        XCODE_VERSION: 15.3
+        XCODE_VERSION: 15.4
        LATEST: true
      - MACOS_VERSION: sonoma
-        XCODE_VERSION: 15.2
+        XCODE_VERSION: 15.3
      - MACOS_VERSION: sonoma
-        XCODE_VERSION: 15.1
+        XCODE_VERSION: 15.2
      - MACOS_VERSION: ventura
        XCODE_VERSION: 14.3.1
        LATEST: true
@@ -95,7 +95,7 @@ task:
  env:
    matrix:
      - MACOS_VERSION: sonoma
-        XCODE_VERSIONS: 15.1,15.2,15.3
+        XCODE_VERSIONS: 15.2,15.3,15.4
  only_if: $CIRRUS_TAG != "" || $CIRRUS_CRON == "weekly" # Every Sunday at 14 UTC
  <<: *defaults
  pull_base_script:
@@ -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.3 templates/xcode.pkr.hcl
+packer build -var macos_version=sonoma -var xcode_version="[15.4]" templates/xcode.pkr.hcl
 ```
@@ -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.3,15.2,15.1}`
+* `ghcr.io/cirruslabs/macos-sonoma-xcode:{latest,15.4,15.3,15.2}`

 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.2.0"
+      version = ">= 1.12.0"
      source  = "github.com/cirruslabs/tart"
    }
  }
@@ -59,8 +59,10 @@ build {
      "source ~/.zprofile",
      "brew --version",
      "brew update",
-      "brew install wget cmake gcc git-lfs jq gh gitlab-runner",
+      "brew install curl wget unzip zip ca-certificates cmake gcc git-lfs jq gh gitlab-runner",
+      "brew install --cask git-credential-manager",
      "git lfs install",
+      "sudo softwareupdate --install-rosetta --agree-to-license"
    ]
  }

@@ -69,6 +71,16 @@ build {
    script = "scripts/install-actions-runner.sh"
  }

+  // Create a /Users/runner → /Users/admin symlink to support certain GitHub Actions
+  // like ruby/setup-ruby that hard-code the "/Users/runner/hostedtoolcache" path[1]
+  //
+  // [1]: https://github.com/ruby/setup-ruby/blob/6bd3d993c602f6b675728ebaecb2b569ff86e99b/common.js#L268
+  provisioner "shell" {
+    inline = [
+      "sudo ln -s /Users/admin /Users/runner"
+    ]
+  }
+
  provisioner "shell" {
    inline = [
      "source ~/.zprofile",
@@ -86,6 +98,8 @@ 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",
@@ -107,4 +121,12 @@ 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.2.0"
+      version = ">= 1.12.0"
      source  = "github.com/cirruslabs/tart"
    }
  }
@@ -1,14 +1,14 @@
 packer {
  required_plugins {
    tart = {
-      version = ">= 1.2.0"
+      version = ">= 1.12.0"
      source  = "github.com/cirruslabs/tart"
    }
  }
 }

 source "tart-cli" "tart" {
-  from_ipsw    = "https://updates.cdn-apple.com/2024WinterFCS/fullrestores/052-77579/4569734E-120C-4F31-AD08-FC1FF825D059/UniversalMac_14.4.1_23E224_Restore.ipsw"
+  from_ipsw    = "https://updates.cdn-apple.com/2024SpringFCS/fullrestores/062-01897/C874907B-9F82-4109-87EB-6B3C9BF1507D/UniversalMac_14.5_23F79_Restore.ipsw"
  vm_name      = "sonoma-vanilla"
  cpu_count    = 4
  memory_gb    = 8
@@ -1,7 +1,7 @@
 packer {
  required_plugins {
    tart = {
-      version = ">= 1.2.0"
+      version = ">= 1.12.0"
      source  = "github.com/cirruslabs/tart"
    }
  }
@@ -1,7 +1,7 @@
 packer {
  required_plugins {
    tart = {
-      version = ">= 1.2.0"
+      version = ">= 1.12.0"
      source  = "github.com/cirruslabs/tart"
    }
  }
@@ -52,8 +52,6 @@ build {
      "brew --version",
      "brew update",
      "brew upgrade",
-      "brew install curl wget unzip zip ca-certificates",
-      "sudo softwareupdate --install-rosetta --agree-to-license"
    ]
  }

@@ -62,10 +60,18 @@ 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 homebrew/cask-versions/temurin17",
+      "brew install openjdk@17",
+      "echo 'export PATH=\"/opt/homebrew/opt/openjdk@17/bin:$PATH\"' >> ~/.zprofile",
      "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",
@@ -98,7 +104,7 @@ build {
  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"
+      "source ~/.zprofile && sudo xcodes install ${version} --experimental-unxip --path /Users/admin/Downloads/Xcode_${version}.xip --select --empty-trash && xcodebuild -downloadAllPlatforms && xcodebuild -runFirstLaunch"
    ]
  }

@@ -120,8 +126,10 @@ 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"
    ]
  }
@@ -157,13 +165,21 @@ build {
    ]
  }

-  // check there is at least 20GB of free space and fail if not
+  // check there is at least 15GB 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 20000 ]] && echo OK || exit 1"
+      "[[ $FREE_MB -gt 15000 ]] && echo OK || exit 1"
+    ]
+  }
+
+  // some other health checks
+  provisioner "shell" {
+    inline = [
+      "source ~/.zprofile",
+      "test -d /Users/runner"
    ]
  }
 }
Author	SHA1	Message	Date
Fedor Korotkov	2793f40e9a	Xcode 15.4 (#154 ) * Xcode 15.4 * Build runner on a release	2024-05-13 15:18:50 -04:00
Fedor Korotkov	7a7778be0f	macOS 14.5 (#153 )	2024-05-13 14:47:27 -04:00
Fedor Korotkov	6f7ef84825	Make sure `/Users/runner` exists in `xcode` variant (#152 ) A follow-up to #145. It seems right now only base variant preserves the symlink. `xcode` and `runner` are missing it and my guess it's due to disk resizing. This change adds a validation script, so we verify `/Users/runner` folder exists in every variant.	2024-05-13 07:56:29 -04:00
Fedor Korotkov	d594e1add0	Install Git Credentials Helper and xcpretty/xcbeauty (#150 ) * Install Git Credentials Helper and xcpretty/xcbeauty Plus move rosetta installation and some other common packages into base variant. * Fixed Node Path	2024-05-07 15:57:00 -04:00
Fedor Korotkov	d50adeeaa2	Use latest Packer plugin (#149 )	2024-05-02 13:10:34 -04:00
Fedor Korotkov	5d1abcb935	Lower the expected free disk size	2024-05-02 09:28:23 -04:00
Fedor Korotkov	8151177d8f	Revert "Fixed Simulator Opening" (#148 ) This reverts commit `e45042edb8`.	2024-05-02 09:27:49 -04:00
Fedor Korotkov	2cd59ec2b4	Fixed Simulator Opening (#146 )	2024-05-01 15:39:25 +02:00
fedor	2dcf12940d	Add Java to path	2024-05-01 08:07:25 -04:00
fedor	acd0ec5913	Use OpenJDK	2024-05-01 08:00:09 -04:00
fedor	f2d703668c	Fixed JDK	2024-05-01 07:55:20 -04:00
fedor	54a41a1e0a	Use sudo	2024-05-01 07:51:33 -04:00
Nikolay Edigaryev	57a0eb2d30	/Users/runner → /Users/admin symlink to support certain GitHub Actions (#145 )	2024-04-22 11:04:53 -04:00