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

Jump to bottom

chore: update MacOS executor to M1 (2.6) #24373

Merged
merged 1 commit into from
Sep 20, 2023
Merged

chore: update MacOS executor to M1 (2.6) #24373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ executors:
image: ubuntu-2204:current
resource_class: arm.large
darwin:
resource_class: macos.m1.medium.gen1
macos:
xcode: 12.5.1
resource_class: medium
xcode: 15.0.0
shell: /bin/bash -eo pipefail
windows:
machine:
Expand Down Expand Up @@ -395,6 +395,9 @@ jobs:
- checkout
- attach_workspace:
at: .
- run:
name: Install Rosetta
command: .circleci/scripts/install-rosetta
- run:
name: Run tests
command: ./scripts/ci/run-prebuilt-tests.sh $(pwd)/test-bin $(pwd)/test-results
Expand Down
7 changes: 7 additions & 0 deletions .circleci/scripts/install-rosetta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash
set -euo pipefail

if [[ "${MACHTYPE}" == "arm64-apple-darwin"* ]]
then
/usr/sbin/softwareupdate --install-rosetta --agree-to-license
fi
Loading