chore: update MacOS executor to M1 (#24372)
parent
75a8bcfae2
commit
b3b982d746
|
@ -29,9 +29,9 @@ executors:
|
||||||
image: ubuntu-2204:current
|
image: ubuntu-2204:current
|
||||||
resource_class: arm.large
|
resource_class: arm.large
|
||||||
darwin:
|
darwin:
|
||||||
|
resource_class: macos.m1.medium.gen1
|
||||||
macos:
|
macos:
|
||||||
xcode: 12.5.1
|
xcode: 15.0.0
|
||||||
resource_class: medium
|
|
||||||
shell: /bin/bash -eo pipefail
|
shell: /bin/bash -eo pipefail
|
||||||
windows:
|
windows:
|
||||||
machine:
|
machine:
|
||||||
|
@ -395,6 +395,9 @@ jobs:
|
||||||
- checkout
|
- checkout
|
||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
at: .
|
at: .
|
||||||
|
- run:
|
||||||
|
name: Install Rosetta
|
||||||
|
command: .circleci/scripts/install-rosetta
|
||||||
- run:
|
- run:
|
||||||
name: Run tests
|
name: Run tests
|
||||||
command: ./scripts/ci/run-prebuilt-tests.sh $(pwd)/test-bin $(pwd)/test-results
|
command: ./scripts/ci/run-prebuilt-tests.sh $(pwd)/test-bin $(pwd)/test-results
|
||||||
|
|
|
@ -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…
Reference in New Issue