Skip to content

Commit c73d46e

Browse files
authored
chore: update MacOS executor to M1 (#521)
1 parent 9db72b0 commit c73d46e

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

.circleci/config.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ executors:
1616
image: ubuntu-2004:202104-01
1717
resource_class: arm.medium
1818
mac:
19+
resource_class: macos.m1.medium.gen1
1920
macos:
20-
xcode: 12.5.1
21-
resource_class: medium
21+
xcode: 15.0.0
2222
shell: /bin/bash -eo pipefail
2323
windows:
2424
machine:
@@ -380,6 +380,9 @@ jobs:
380380
- checkout
381381
- attach_workspace:
382382
at: .
383+
- run:
384+
name: Install Rosetta
385+
command: ./scripts/ci/install-rosetta.sh
383386
- run:
384387
name: Run tests
385388
command: ./scripts/ci/run-prebuilt-tests.sh $(pwd)/test-bin-<< parameters.os >>-<< parameters.arch >> $(pwd)/test-results

scripts/ci/install-rosetta.sh

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
4+
if [[ "${MACHTYPE}" == "arm64-apple-darwin"* ]]
5+
then
6+
/usr/sbin/softwareupdate --install-rosetta --agree-to-license
7+
fi

0 commit comments

Comments
 (0)