Update using-macos documentation - m4 rollout (#9434)

* Update using-macos documentation - m4 rollout

* fix table formatting

---------

Co-authored-by: Rosie Yohannan <[email protected]>

Author: cadecairos

jekyll/_cci2/using-macos.adoc

@@ -18,12 +18,12 @@ You can use the macOS execution environment to run your xref:jobs-steps#[jobs] i
 jobs:
   build:
     macos:
-      xcode: 15.4.0
-    resource_class: m2pro.medium
+      xcode: 16.4.0
+    resource_class: m4pro.medium
 
     steps:
       # Commands will execute in macOS container
-      # with Xcode 15.4.0 installed
+      # with Xcode 16.4.0 installed
       - run: xcodebuild -version
 ----
 
@@ -45,8 +45,8 @@ include::../_includes/partials/execution-resources/macos-resource-table.adoc[]
 jobs:
   build:
     macos:
-      xcode: "15.4.0"
-    resource_class: m2pro.medium
+      xcode: 16.4.0
+    resource_class: m4pro.medium
 ----
 
 [#view-resource-usage]
@@ -59,9 +59,7 @@ include::../_includes/partials/execution-resources/resource-class-view.adoc[]
 
 Each `macos` job is run in a fresh virtual machine, using a specified version of macOS. CircleCI builds and deploys a new image each time a new stable, or beta, version of Xcode is released by Apple. The contents of build images remain unchanged in most circumstances. However, in exceptional circumstances CircleCI might be forced to re-build a container. CircleCI's goal is to keep your execution environment stable, and to allow you to opt-in to newer macOS environments by setting the `xcode` key in your `.circleci/config.yml` file.
 
-Periodically, CircleCI will update the version of macOS each image includes to ensure the execution environment is as up to date as possible. When a new major version of macOS is released, CircleCI will update once the new major version of Xcode reaches the `xx.2` release. This ensures the execution environment is kept stable.
-
-CircleCI will announce the availability of new macOS containers, including Xcode betas, in the announcements section of our link:https://discuss.circleci.com/c/announcements[Discuss site].
+CircleCI will announce the availability of new macOS images, including Xcode betas, on our link:https://circleci.com/changelog[changelog].
 
 [#beta-image-support]
 === Beta image support
@@ -142,9 +140,9 @@ Then call the `preboot-simulator` command, as shown in the example below:
 ----
 steps:
   - macos/preboot-simulator:
-      version: "15.0"
+      version: "18.5"
       platform: "iOS"
-      device: "iPhone 13 Pro Max"
+      device: "iPhone 16 Pro Max"
 ----
 
 It is advisable to place this command early in your job to allow maximum time for the simulator to boot in the background.
@@ -155,10 +153,10 @@ If you require an iPhone simulator that is paired with an Apple Watch simulator,
 ----
 steps:
   - macos/preboot-paired-simulator:
-      iphone-device: "iPhone 13"
-      iphone-version: "15.0"
-      watch-device: "Apple Watch Series 7 - 45mm"
-      watch-version: "8.0"
+      iphone-device: "iPhone 16"
+      iphone-version: "18.5"
+      watch-device: "Apple Watch Series 10 - 45mm"
+      watch-version: "11.5"
 ----
 
 NOTE: It may take a few minutes to boot a simulator, or longer if booting a pair of simulators. During this time, any calls to commands such as `xcrun simctl list` may appear to hang while the simulator is booting up.
@@ -226,7 +224,7 @@ version: 2.1
 jobs:
   build-and-test:
     macos:
-      xcode: 14.2.0
+      xcode: 16.4.0
     environment:
       HOMEBREW_NO_AUTO_UPDATE: 1
     steps:
@@ -265,7 +263,7 @@ version: 2.1
 jobs:
   build-and-test:
     macos:
-      xcode: 14.2.0
+      xcode: 16.4.0
     environment:
       FL_OUTPUT_DIR: output
 

jekyll/_includes/partials/execution-resources/xcode-silicon-vm.adoc

@@ -1,99 +1,182 @@
 [.table.table-striped]
-[cols=5*, options="header", stripes=even]
+[cols=6*, options="header", stripes=even]
 |===
 | Config
 | Xcode Version
 | macOS Version
+| Supported Resource Classes
 | VM Software Manifest
 | Release Notes
 
 | `16.4.0`
 | Xcode 16.4 GA (16F6)
 | 15.3.2
+a| * m4pro.medium
+   * m4pro.large
+   * m2pro.medium
+   * m2pro.large
+   * macos.m1.medium.gen1
+   * macos.m1.large.gen1
 | link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v15338/manifest.txt[Installed software]
 | link:https://circleci.com/changelog/xcode-16-4-ga-available/[Release Notes]
 
 | `16.3.0`
 | Xcode 16.3 (16E140)
 | 15.3.2
+a| * m4pro.medium
+  * m4pro.large
+  * m2pro.medium
+  * m2pro.large
+  * macos.m1.medium.gen1
+  * macos.m1.large.gen1
 | link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v15328/manifest.txt[Installed software]
 | link:https://circleci.com/changelog/xcode-16-3-available/[Release Notes]
 
 | `16.2.0`
 | Xcode 16.2 GA (16C5032a)
 | 14.6.1
+a| * m4pro.medium
+  * m4pro.large
+  * m2pro.medium
+  * m2pro.large
+  * macos.m1.medium.gen1
+  * macos.m1.large.gen1
 | link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v15180/manifest.txt[Installed software]
 | link:https://discuss.circleci.com/t/xcode-16-2-ga-released/52486[Release Notes]
 
 | `16.1.0`
 | Xcode 16.1 (16B40)
 | 14.6.1
+a| * m4pro.medium
+  * m4pro.large
+  * m2pro.medium
+  * m2pro.large
+  * macos.m1.medium.gen1
+  * macos.m1.large.gen1
 | link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v15121/manifest.txt[Installed software]
 | link:https://discuss.circleci.com/t/xcode-16-1-ga-released/52229[Release Notes]
 
 | `16.0.0`
 | Xcode 16.0 (16A242d)
 | 14.6.1
+a| * m4pro.medium
+  * m4pro.large
+  * m2pro.medium
+  * m2pro.large
+  * macos.m1.medium.gen1
+  * macos.m1.large.gen1
 | link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v15048/manifest.txt[Installed software]
 | link:https://discuss.circleci.com/t/xcode-16-ga-released/51990[Release Notes]
 
 | `15.4.0`
 | Xcode 15.4 (15F31d)
 | 14.3.1
+a| * m4pro.medium
+  * m4pro.large
+  * m2pro.medium
+  * m2pro.large
+  * macos.m1.medium.gen1
+  * macos.m1.large.gen1
 | link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v14775/manifest.txt[Installed software]
 | link:https://discuss.circleci.com/t/xcode-15-4-0-ga-released/50897[Release Notes]
 
 | `15.3.0`
 | Xcode 15.3 (15E204a)
 | 14.3.1
+a| * m4pro.medium
+  * m4pro.large
+  * m2pro.medium
+  * m2pro.large
+  * macos.m1.medium.gen1
+  * macos.m1.large.gen1
 | link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v14490/manifest.txt[Installed software]
 | link:https://discuss.circleci.com/t/xcode-15-3-ga-released/50717[Release Notes]
 
 | `15.2.0`
 | Xcode 15.2 (15C500b)
 | 14.1
+a| * m4pro.medium
+  * m4pro.large
+  * m2pro.medium
+  * m2pro.large
+  * macos.m1.medium.gen1
+  * macos.m1.large.gen1
 | link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v14040/manifest.txt[Installed software]
 | link:https://discuss.circleci.com/t/xcode-15-2-released/50197[Release Notes]
 
 | `15.1.0`
 | Xcode 15.1 (15C65)
 | 14.1
+a| * m4pro.medium
+  * m4pro.large
+  * m2pro.medium
+  * m2pro.large
+  * macos.m1.medium.gen1
+  * macos.m1.large.gen1
 | link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v13944/manifest.txt[Installed software]
 | link:https://discuss.circleci.com/t/xcode-15-1-rc-released/50026[Release Notes]
 
 | `15.0.0`
 | Xcode 15 (15A240d)
 | 13.5.1
+a| * m2pro.medium
+  * m2pro.large
+  * macos.m1.medium.gen1
+  * macos.m1.large.gen1
 | link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v13456/manifest.txt[Installed software]
 | link:https://discuss.circleci.com/t/xcode-15-rc-released-important-notice-for-visionos-sdk-users/49278[Release Notes]
 
 | `14.3.1`
 | Xcode 14.3.1 (14E300b)
 | 13.2.1
+a| * m4pro.medium
+  * m4pro.large
+  * m2pro.medium
+  * m2pro.large
+  * macos.m1.medium.gen1
+  * macos.m1.large.gen1
 | link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v12128/manifest.txt[Installed software]
 | link:https://discuss.circleci.com/t/xcode-14-3-1-rc-released/48152[Release Notes]
 
 | `14.2.0`
 | Xcode 14.2 (14C18)
 | 12.6.3
+a| * m2pro.medium
+  * m2pro.large
+  * macos.m1.medium.gen1
+  * macos.m1.large.gen1
 | link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v11441/manifest.txt[Installed software]
 | link:https://discuss.circleci.com/t/announcing-apple-silicon-m1-support-now-available/46908[Release Notes]
 
 | `14.1.0`
 | Xcode 14.1 (14B47b)
 | 12.6.1
+a| * m2pro.medium
+  * m2pro.large
+  * macos.m1.medium.gen1
+  * macos.m1.large.gen1
 | link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v11763/manifest.txt[Installed software]
 | link:https://discuss.circleci.com/t/announcing-m1-large-now-available-on-performance-plans/47797/22[Release Notes]
 
 | `14.0.1`
 | Xcode 14.0.1 (14A400)
 | 12.6.1
+a| * m2pro.medium
+  * m2pro.large
+  * macos.m1.medium.gen1
+  * macos.m1.large.gen1
 | link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v11770/manifest.txt[Installed software]
 | link:https://discuss.circleci.com/t/announcing-m1-large-now-available-on-performance-plans/47797/22[Release Notes]
 
 | `13.4.1`
 | Xcode 13.4.1 (13F100)
 | 12.6.1
+a| * m4pro.medium
+  * m4pro.large
+  * m2pro.medium
+  * m2pro.large
+  * macos.m1.medium.gen1
+  * macos.m1.large.gen1
 | link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v11776/manifest.txt[Installed software]
 | link:https://discuss.circleci.com/t/announcing-m1-large-now-available-on-performance-plans/47797/22[Release Notes]
 |===