From 53ea076eea45372f41d6ad31dd48fc59f7742605 Mon Sep 17 00:00:00 2001 From: fritz <85515968+fritz-circleci@users.noreply.github.com> Date: Wed, 2 Oct 2024 08:57:19 -0500 Subject: [PATCH] [MAC-2291] add m2pro.medium to available resources (#8951) * add m2pro.medium to available resources * fix HTML-Proofer error * updating example macos snippets to use m2pro.medium * revert ja translation files * use current GA xcode release available at CCI in example snippets * missed a code snippet * update hello world example * add m2pro large --- jekyll/_cci2/configuration-reference.adoc | 2 +- jekyll/_cci2/hello-world.adoc | 3 ++- jekyll/_cci2/optimizations.adoc | 2 +- jekyll/_cci2/using-macos.adoc | 10 +++++----- .../_includes/snippets/macos-resource-table.adoc | 14 ++++++++++++++ jekyll/archived/_cci2/using-macos.md | 4 ++-- 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/jekyll/_cci2/configuration-reference.adoc b/jekyll/_cci2/configuration-reference.adoc index 48ca4c7a3d1..6278ec6f1d1 100644 --- a/jekyll/_cci2/configuration-reference.adoc +++ b/jekyll/_cci2/configuration-reference.adoc @@ -1255,7 +1255,7 @@ jobs: build: macos: xcode: "15.4.0" - resource_class: macos.m1.medium.gen1 + resource_class: m2pro.medium steps: ... // other config ---- diff --git a/jekyll/_cci2/hello-world.adoc b/jekyll/_cci2/hello-world.adoc index bb0f999f512..6e0fdd6c07d 100644 --- a/jekyll/_cci2/hello-world.adoc +++ b/jekyll/_cci2/hello-world.adoc @@ -93,7 +93,8 @@ version: 2.1 jobs: hello-job: macos: - xcode: 13.4.1 + xcode: 15.4.0 + resource_class: m2pro.medium steps: - checkout # check out the code in the project directory - run: echo "hello world" # run the `echo` command diff --git a/jekyll/_cci2/optimizations.adoc b/jekyll/_cci2/optimizations.adoc index ff15bca4b8d..770f479752f 100644 --- a/jekyll/_cci2/optimizations.adoc +++ b/jekyll/_cci2/optimizations.adoc @@ -128,7 +128,7 @@ jobs: build: macos: xcode: "15.4.0" - resource_class: macos.m1.medium.gen1 + resource_class: m2pro.medium steps: # ... other config ---- diff --git a/jekyll/_cci2/using-macos.adoc b/jekyll/_cci2/using-macos.adoc index a76e6e9c007..e056f42f906 100644 --- a/jekyll/_cci2/using-macos.adoc +++ b/jekyll/_cci2/using-macos.adoc @@ -19,12 +19,12 @@ You can use the macOS execution environment to run your xref:jobs-steps#[jobs] i jobs: build: macos: - xcode: 14.2.0 - resource_class: macos.m1.medium.gen1 + xcode: 15.4.0 + resource_class: m2pro.medium steps: # Commands will execute in macOS container - # with Xcode 14.2.0 installed + # with Xcode 15.4.0 installed - run: xcodebuild -version ---- @@ -46,8 +46,8 @@ jobs: jobs: build: macos: - xcode: "14.2.0" - resource_class: macos.m1.medium.gen1 + xcode: "15.4.0" + resource_class: m2pro.medium ---- [#view-resource-usage] diff --git a/jekyll/_includes/snippets/macos-resource-table.adoc b/jekyll/_includes/snippets/macos-resource-table.adoc index a9de29fdfa2..5ecb177c12b 100644 --- a/jekyll/_includes/snippets/macos-resource-table.adoc +++ b/jekyll/_includes/snippets/macos-resource-table.adoc @@ -14,6 +14,20 @@ | 12GB | icon:check[] | icon:times[] +| + +| `m2pro.medium` +| 4 @ 3.49 GHz +| 8GB +| icon:check[] +| icon:times[] +| + +| `m2pro.large` +| 4 @ 3.49 GHz +| 8GB +| icon:check[] +| icon:times[] |=== [WARNING] diff --git a/jekyll/archived/_cci2/using-macos.md b/jekyll/archived/_cci2/using-macos.md index 69173d1bb84..16f35d390b2 100644 --- a/jekyll/archived/_cci2/using-macos.md +++ b/jekyll/archived/_cci2/using-macos.md @@ -22,11 +22,11 @@ You can use the macOS execution environment to run your [jobs]({{site.baseurl}}/ jobs: build: macos: - xcode: 14.2.0 + xcode: 15.4.0 steps: # Commands will execute in macOS container - # with Xcode 14.2.0 installed + # with Xcode 15.4.0 installed - run: xcodebuild -version ```