Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update MacOS resource classes in CircleCI config #11543

Closed
wants to merge 9 commits into from
Closed

Update MacOS resource classes in CircleCI config #11543

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0370dd4
Update MacOS resource classes in CircleCI config
ltamasi Jun 15, 2023
633152d
Merge branch 'main' into circleci_macos_sunset
ltamasi Jun 15, 2023
a767f84
Add a dummy change to trigger build on CI
ltamasi Jun 15, 2023
2a8457c
Revert "Add a dummy change to trigger build on CI"
ltamasi Jun 15, 2023
40d78ee
Try m1.medium first
ltamasi Jun 15, 2023
4ff5c12
Update Xcode version too
ltamasi Jun 15, 2023
1225f48
Install Rosetta 2
ltamasi Jun 16, 2023
577ff7a
Try to reduce parallelism
ltamasi Jun 16, 2023
d826978
Merge branch 'main' into circleci_macos_sunset
ltamasi Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ commands:
- run:
name: Install JDK 8 on macos
command: |
sudo softwareupdate --install-rosetta --agree-to-license
brew install --cask adoptopenjdk/openjdk/adoptopenjdk8

increase-max-open-files-on-macos:
Expand Down Expand Up @@ -209,21 +210,21 @@ executors:
jobs:
build-macos:
macos:
xcode: 12.5.1
resource_class: large
xcode: 14.3.1
resource_class: macos.m1.medium.gen1
environment:
ROCKSDB_DISABLE_JEMALLOC: 1 # jemalloc cause env_test hang, disable it for now
steps:
- increase-max-open-files-on-macos
- install-gflags-on-macos
- pre-steps-macos
- run: ulimit -S -n `ulimit -H -n` && OPT=-DCIRCLECI make V=1 J=32 -j32 all
- run: ulimit -S -n `ulimit -H -n` && OPT=-DCIRCLECI make V=1 J=16 -j16 all
- post-steps

build-macos-cmake:
macos:
xcode: 12.5.1
resource_class: large
xcode: 14.3.1
resource_class: macos.m1.medium.gen1
parameters:
run_even_tests:
description: run even or odd tests, used to split tests to 2 groups
Expand All @@ -239,20 +240,20 @@ jobs:
command: ulimit -S -n `ulimit -H -n` && mkdir build && cd build && cmake -DWITH_GFLAGS=1 ..
- run:
name: "Build tests"
command: cd build && make V=1 -j32
command: cd build && make V=1 -j16
- when:
condition: << parameters.run_even_tests >>
steps:
- run:
name: "Run even tests"
command: ulimit -S -n `ulimit -H -n` && cd build && ctest -j32 -I 0,,2
command: ulimit -S -n `ulimit -H -n` && cd build && ctest -j16 -I 0,,2
- when:
condition:
not: << parameters.run_even_tests >>
steps:
- run:
name: "Run odd tests"
command: ulimit -S -n `ulimit -H -n` && cd build && ctest -j32 -I 1,,2
command: ulimit -S -n `ulimit -H -n` && cd build && ctest -j16 -I 1,,2
- post-steps

build-linux:
Expand Down Expand Up @@ -607,8 +608,8 @@ jobs:

build-macos-java:
macos:
xcode: 12.5.1
resource_class: large
xcode: 14.3.1
resource_class: macos.m1.medium.gen1
environment:
JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home
ROCKSDB_DISABLE_JEMALLOC: 1 # jemalloc causes java 8 crash
Expand All @@ -632,8 +633,8 @@ jobs:

build-macos-java-static:
macos:
xcode: 12.5.1
resource_class: large
xcode: 14.3.1
resource_class: macos.m1.medium.gen1
environment:
JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home
steps:
Expand All @@ -657,8 +658,8 @@ jobs:

build-macos-java-static-universal:
macos:
xcode: 12.5.1
resource_class: large
xcode: 14.3.1
resource_class: macos.m1.medium.gen1
environment:
JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home
steps:
Expand Down
Loading