Skip to content

Commit

Permalink
[MAC-2291] add m2pro.medium to available resources (#8951)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
fritz-circleci authored Oct 2, 2024
1 parent 12255e1 commit 53ea076
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 10 deletions.
2 changes: 1 addition & 1 deletion jekyll/_cci2/configuration-reference.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,7 @@ jobs:
build:
macos:
xcode: "15.4.0"
resource_class: macos.m1.medium.gen1
resource_class: m2pro.medium
steps:
... // other config
----
Expand Down
3 changes: 2 additions & 1 deletion jekyll/_cci2/hello-world.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jekyll/_cci2/optimizations.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
build:
macos:
xcode: "15.4.0"
resource_class: macos.m1.medium.gen1
resource_class: m2pro.medium
steps:
# ... other config
----
Expand Down
10 changes: 5 additions & 5 deletions jekyll/_cci2/using-macos.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
----

Expand All @@ -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]
Expand Down
14 changes: 14 additions & 0 deletions jekyll/_includes/snippets/macos-resource-table.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions jekyll/archived/_cci2/using-macos.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down

0 comments on commit 53ea076

Please sign in to comment.