Skip to content

Commit

Permalink
Update mac builders to use Circle's gen2 mac runner (emscripten-core#…
Browse files Browse the repository at this point in the history
…1222)

This runner is faster and more efficient.
Also factor the mac configuration into an executor.
  • Loading branch information
dschuff authored and shlomif committed Sep 29, 2023
1 parent bda6e3d commit b5fb454
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ executors:
bionic:
docker:
- image: buildpack-deps:bionic
mac:
environment:
EMSDK_NOTTY: "1"
# Without this, any `brew installl` command will result in self-update of
# brew itself which takes more than 4 minutes.
HOMEBREW_NO_AUTO_UPDATE: "1"
macos:
xcode: "12.5.1"
resource_class: macos.x86.medium.gen2

jobs:
flake8:
Expand Down Expand Up @@ -48,13 +57,7 @@ jobs:
source emsdk_env.sh
test/test.py
test-mac:
macos:
xcode: "12.5.1"
environment:
EMSDK_NOTTY: "1"
# Without this, any `brew installl` command will result in self-update of
# brew itself which takes more than 4 minutes.
HOMEBREW_NO_AUTO_UPDATE: "1"
executor: mac
steps:
- checkout
- run:
Expand Down Expand Up @@ -190,11 +193,7 @@ jobs:
- run: test/test_bazel.sh

test-bazel-mac:
macos:
xcode: "12.5.1"
environment:
EMSDK_NOTTY: "1"
HOMEBREW_NO_AUTO_UPDATE: "1"
executor: mac
steps:
- checkout
- run: brew install grep
Expand Down

0 comments on commit b5fb454

Please sign in to comment.