diff --git a/.circleci/config.yml b/.circleci/config.yml index da66675b374..98899892cc0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,9 +29,9 @@ executors: image: ubuntu-2004:202101-01 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: @@ -389,6 +389,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 diff --git a/.circleci/scripts/install-rosetta b/.circleci/scripts/install-rosetta new file mode 100755 index 00000000000..cab61f0eabf --- /dev/null +++ b/.circleci/scripts/install-rosetta @@ -0,0 +1,7 @@ +#!/bin/bash +set -euo pipefail + +if [[ "${MACHTYPE}" == "arm64-apple-darwin"* ]] +then + /usr/sbin/softwareupdate --install-rosetta --agree-to-license +fi