Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix macOS Executors #72

Merged
merged 8 commits into from
Jun 12, 2024
Merged

Fix macOS Executors #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
da65dab
Update Unity editor version to 2022.3.22f1 (LTS)
GabLeRoux Jun 12, 2024
8dadf8a
Merge branch 'main' into bump-versions-2024-06-12
GabLeRoux Jun 12, 2024
3001d40
Update default Xcode version to 15.3.0 in macOS executor
GabLeRoux Jun 12, 2024
406cffa
Merge branch 'main' into bump-versions-2024-06-12
GabLeRoux Jun 12, 2024
304e3bc
Update resource_class enum
GabLeRoux Jun 12, 2024
2ad8a2b
Remove large from enum 🤷
GabLeRoux Jun 12, 2024
45cec2c
Emptu commit to trigger pipelines
GabLeRoux Jun 12, 2024
fb3b27f
Update macOS resource class to "macos.m1.medium.gen1".
GabLeRoux Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/test-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ workflows:
executor:
name: "unity/macos"
editor_version: "2022.3.33f1"
resource_class: "large"
resource_class: "macos.m1.medium.gen1"
project-path: "Unity2D-Demo-Game-CI-CD/src"
test-platform: "playmode"
filters: *filters
Expand All @@ -175,7 +175,7 @@ workflows:
executor:
name: "unity/macos"
editor_version: "2022.3.33f1"
resource_class: "large"
resource_class: "macos.m1.medium.gen1"
project-path: "Unity2D-Demo-Game-CI-CD/src"
custom-parameters: "-testFilter EnemyMovesLeft -customParam1 potato -customParam2 $CIRCLE_WORKFLOW_ID"
test-platform: "playmode"
Expand Down Expand Up @@ -227,7 +227,7 @@ workflows:
executor:
name: "unity/macos"
editor_version: "2022.3.33f1"
resource_class: "large"
resource_class: "macos.m1.medium.gen1"
project-path: "Unity2D-Demo-Game-CI-CD/src"
build-target: StandaloneOSX
compress: true
Expand Down Expand Up @@ -399,7 +399,7 @@ workflows:
executor:
name: "unity/macos"
editor_version: "2022.3.33f1"
resource_class: "large"
resource_class: "macos.m1.medium.gen1"
project-path: "Unity2D-Demo-Game-CI-CD/src"
build-target: StandaloneOSX
build-method: "MyCustomBuildCommand.MyCustomBuildMethod"
Expand Down
4 changes: 2 additions & 2 deletions src/examples/test_and_build_personal_license.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ usage:
executor:
name: 'unity/macos'
editor_version: '2022.3.33f1'
resource_class: 'large'
resource_class: 'macos.m1.medium.gen1'
project-path: 'Unity2D-Demo-Game-CI-CD/src'
test-platform: 'playmode'
context: unity
Expand All @@ -99,7 +99,7 @@ usage:
unity-password-var-name: 'UNITY_PASSWORD'
executor:
name: 'unity/macos'
resource_class: "large"
resource_class: "macos.m1.medium.gen1"
editor_version: '2022.3.33f1'
project-path: 'Unity2D-Demo-Game-CI-CD/src'
build-target: StandaloneOSX
Expand Down
4 changes: 2 additions & 2 deletions src/examples/test_and_build_pro_or_plus_license.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ usage:
executor:
name: 'unity/macos'
editor_version: '2022.3.33f1'
resource_class: 'large'
resource_class: 'macos.m1.medium.gen1'
project-path: 'Unity2D-Demo-Game-CI-CD/src'
test-platform: 'playmode'
context: unity
Expand All @@ -99,7 +99,7 @@ usage:
unity-password-var-name: 'UNITY_PASSWORD'
executor:
name: 'unity/macos'
resource_class: "large"
resource_class: "macos.m1.medium.gen1"
editor_version: '2022.3.33f1'
project-path: 'Unity2D-Demo-Game-CI-CD/src'
build-target: StandaloneOSX
Expand Down
6 changes: 3 additions & 3 deletions src/executors/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ parameters:
If you are receiving a "CircleCI received exit code 137" from the build job, you may need to increase the resource class.
For details on resource class availability, see https://circleci.com/docs/using-macos#available-resource-classes.
type: enum
default: medium
enum: [ medium, macos.x86.medium.gen2, large, macos.x86.metal.gen1 ]
default: macos.m1.medium.gen1
enum: [ medium, macos.m1.medium.gen1, large, macos.m1.large.gen1 ]
xcode_version:
description: |
Pick the Xcode version.
Available options can be found at https://circleci.com/docs/using-macos#supported-xcode-versions.
type: string
default: 13.4.1
default: 15.4.0

macos:
xcode: << parameters.xcode_version >>
Expand Down