Removed redundant xcodes version command in provisioner

Updated simulator
Fixed Xcodes installation (#304 )
2026-09-30 11:51:13 +02:00 · 2025-11-12 20:23:10 -05:00 · 2025-11-12 20:21:25 -05:00 · 2025-11-12 19:14:44 -05:00 · 2025-11-12 19:00:34 -05:00 · 2025-11-12 18:18:51 -05:00
4 changed files with 38 additions and 16 deletions
@@ -1,6 +1,5 @@
 task:
  name: "Update Runner Image ($MACOS_VERSION)"
-  execution_lock: runner-image-update
  env:
    matrix:
      - MACOS_VERSION: sonoma
@@ -13,7 +12,7 @@ task:
        XCODE_COMPONENTS: "\"MetalToolchain\""
        DISK_SIZE: 400
      - MACOS_VERSION: tahoe
-        XCODE_VERSIONS: "26.1,\"26.0.1\",\"26.2-beta\""
+        XCODE_VERSIONS: "\"26.1.1\",\"26.0.1\",\"26.2-beta\""
        XCODE_COMPONENTS: "\"MetalToolchain\""
        DISK_SIZE: 280
  <<: *defaults
@@ -4,9 +4,12 @@ task:
  env:
    matrix:
      - MACOS_VERSION: tahoe
-        XCODE_VERSION: "26.0.1"
+        XCODE_VERSION: "26.1.1"
        XCODE_COMPONENTS: "MetalToolchain"
        LATEST: true
+      - MACOS_VERSION: tahoe
+        XCODE_VERSION: "26.0.1"
+        XCODE_COMPONENTS: "MetalToolchain"
      - MACOS_VERSION: sequoia
        XCODE_VERSION: 16.4
        LATEST: true
@@ -1,6 +1,6 @@
 == Runtimes ==
 iOS 26.0 (26.0.1 - 23A8464) - com.apple.CoreSimulator.SimRuntime.iOS-26-0
-iOS 26.1 (26.1 - 23B80) - com.apple.CoreSimulator.SimRuntime.iOS-26-1
+iOS 26.1 (26.1 - 23B86) - com.apple.CoreSimulator.SimRuntime.iOS-26-1
 iOS 26.2 (26.2 - 23C5027f) - com.apple.CoreSimulator.SimRuntime.iOS-26-2
 tvOS 26.0 (26.0 - 23J352) - com.apple.CoreSimulator.SimRuntime.tvOS-26-0
 tvOS 26.1 (26.1 - 23J579) - com.apple.CoreSimulator.SimRuntime.tvOS-26-1
@@ -137,7 +137,7 @@ build {
  provisioner "shell" {
    inline = [
      "source ~/.zprofile",
-      "brew install xcodesorg/made/xcodes",
+      "brew install xcodes",
      "xcodes version",
    ]
  }
@@ -336,6 +336,37 @@ build {
    ]
  }

+  # Wait for the "update_dyld_sim_shared_cache" process[1][2] to finish
+  # to avoid wasting CPU cycles after boot
+  #
+  # [1]: https://apple.stackexchange.com/questions/412101/update-dyld-sim-shared-cache-is-taking-up-a-lot-of-memory
+  # [2]: https://stackoverflow.com/a/68394101/9316533
+  provisioner "shell" {
+    inline = [
+      "source ~/.zprofile",
+      "xcrun simctl runtime dyld_shared_cache update --all || sleep 180",
+      "xcrun simctl list -v",
+    ]
+  }
+
+  // Restart the VM
+  provisioner "shell" {
+    inline = [
+      "sudo shutdown -r now"
+    ]
+    expect_disconnect = true
+  }
+
+  // Wait for VM to come back up and run simctl commands again
+  provisioner "shell" {
+    inline = [
+      "source ~/.zprofile",
+      "xcrun simctl runtime dyld_shared_cache update --all || sleep 180",
+      "xcrun simctl list -v"
+    ]
+    pause_before = "60s"
+  }
+
  # Compatibility with GitHub Actions Runner Images, where
  # /usr/local/bin belongs to the default user. Also see [2].
  #
@@ -347,17 +378,6 @@ build {
    ]
  }

-  # Wait for the "update_dyld_sim_shared_cache" process[1][2] to finish
-  # to avoid wasting CPU cycles after boot
-  #
-  # [1]: https://apple.stackexchange.com/questions/412101/update-dyld-sim-shared-cache-is-taking-up-a-lot-of-memory
-  # [2]: https://stackoverflow.com/a/68394101/9316533
-  provisioner "shell" {
-    inline = [
-      "sleep 1800"
-    ]
-  }
-
  // Install setup-info-generator
  provisioner "shell" {
    inline = [
Author	SHA1	Message	Date
Fedor Korotkov	2e6e2dfb6e	Removed redundant `xcodes version` command in provisioner	2025-11-12 20:23:10 -05:00
Fedor Korotkov	0652373c8c	Updated simulator	2025-11-12 20:21:25 -05:00
Fedor Korotkov	082799eb6f	Fixed Xcodes installation (#304 ) * Fixed Xcodes installation * Removed redundant execution lock from Cirrus runner configuration	2025-11-12 19:14:44 -05:00
Fedor Korotkov	3b47c8dfc6	Revert GitHub Actions Runner compatibility provisioner changes	2025-11-12 19:00:34 -05:00
Fedor Korotkov	69ed3fe0fa	Xcode 26.1.1 (#302 ) * Xcode 26.1.1 * Proper literal * Install prebuilt binary for xcodes * split * Revert "split" This reverts commit `8a0363fe31`. * Fix xcodes installation and update file ownership logic * echo path * Use full path * revert chmod	2025-11-12 18:18:51 -05:00
Fedor Korotkov	256b8cc1c8	Restart VM while building Xcode variant (#301 ) * Restart VM while building Xcode variant In an attempt to make https://github.com/actions/runner-images/issues/12948 less flaky. Xcode Release Notes at some point mentioend a first boot for another issue so let's make the VM boot twoce and do caching population just to be extra cautios. * just `xcrun simctl list -v` * support sonoma	2025-11-11 18:10:42 -05:00