Skip to content

Commit

Permalink
chore: update macos runners to large m1 (#1557)
Browse files Browse the repository at this point in the history
PR updating to large m1 macos resources

potentially fixes #1555
  • Loading branch information
EverlastingBugstopper authored Mar 31, 2023
1 parent 986115e commit ab1ec3a
Showing 1 changed file with 17 additions and 6 deletions.
23 changes: 17 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ executors:
environment:
XTASK_TARGET: "x86_64-unknown-linux-gnu"
CHECK_GLIBC: "true"

arm_ubuntu: &arm_ubuntu_executor
machine:
machine:
image: ubuntu-2004:2022.04.1
resource_class: arm.large
environment:
Expand All @@ -52,8 +52,8 @@ executors:

amd_macos: &amd_macos_executor
macos:
xcode: "13.4"
resource_class: medium
xcode: "14.2"
resource_class: macos.m1.large.gen1
environment:
XTASK_TARGET: "x86_64-apple-darwin"
APPLE_TEAM_ID: "YQK948L752"
Expand All @@ -65,7 +65,7 @@ executors:
arm_macos: &arm_macos_executor
macos:
xcode: "13.4"
resource_class: medium
resource_class: macos.m1.large.gen1
environment:
XTASK_TARGET: "aarch64-apple-darwin"
APPLE_TEAM_ID: "YQK948L752"
Expand Down Expand Up @@ -335,6 +335,17 @@ commands:
command: |
brew install curl
echo 'export PATH="/usr/local/opt/curl/bin:$PATH"' >> $BASH_ENV
- run:
name: Install Rosetta 2
command: |
if [ "$(uname -m)" = "arm64" ]; then
/usr/sbin/softwareupdate --install-rosetta --agree-to-license
else
echo "Rosetta 2 can only be installed on Apple Silicon!"
exit 1
fi
- install_volta:
platform: << parameters.platform >>
Expand Down Expand Up @@ -454,7 +465,7 @@ commands:
key: rust-<< pipeline.parameters.cache_version >>-<< parameters.platform >>-{{ checksum "Cargo.lock" }}-{{ checksum "rust-toolchain.toml" }}
paths:
- ~/.cargo/

- when:
condition:
equal: [*amd_windows_executor, << parameters.platform >>]
Expand Down

0 comments on commit ab1ec3a

Please sign in to comment.