Skip to content

Commit

Permalink
chore: update MacOS executor to M1 (#24373)
Browse files Browse the repository at this point in the history
  • Loading branch information
bnpfeife authored Sep 20, 2023
1 parent 5a89b76 commit 8d4470d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
7 changes: 5 additions & 2 deletions .circleci/config.yml
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
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

0 comments on commit 8d4470d

Please sign in to comment.