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.

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

ci: Update MacOS runner to macos13 #2324

Merged
merged 14 commits into from
Jul 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 16 additions & 17 deletions .github/workflows/kvrocks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,25 +110,24 @@ jobs:
fail-fast: false
matrix:
include:
# FIXME: update macos-11 to macos-12/13
# - name: Darwin Clang
# os: macos-11
# compiler: auto
- name: Darwin Clang
os: macos-13
compiler: auto
- name: Darwin Clang arm64
os: macos-14
compiler: auto
# - name: Darwin Clang without Jemalloc
# os: macos-11
# compiler: auto
# without_jemalloc: -DDISABLE_JEMALLOC=ON
# - name: Darwin Clang with OpenSSL
# os: macos-11
# compiler: auto
# with_openssl: -DENABLE_OPENSSL=ON
# - name: Darwin Clang without luaJIT
# os: macos-11
# compiler: auto
# without_luajit: -DENABLE_LUAJIT=OFF
- name: Darwin Clang without Jemalloc
os: macos-13
compiler: auto
without_jemalloc: -DDISABLE_JEMALLOC=ON
- name: Darwin Clang with OpenSSL
os: macos-13
compiler: auto
with_openssl: -DENABLE_OPENSSL=ON
- name: Darwin Clang without luaJIT
os: macos-13
compiler: auto
without_luajit: -DENABLE_LUAJIT=OFF
- name: Ubuntu GCC
os: ubuntu-20.04
compiler: gcc
Expand Down Expand Up @@ -212,7 +211,7 @@ jobs:
- name: Setup macOS
if: ${{ startsWith(matrix.os, 'macos') }}
run: |
brew install cmake gcc autoconf automake libtool openssl
brew install cmake gcc autoconf automake libtool openssl coreutils
echo "NPROC=$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
echo "CMAKE_EXTRA_DEFS=-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl" >> $GITHUB_ENV
- name: Setup Linux
Expand Down
2 changes: 1 addition & 1 deletion x.py
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def test_go(dir: str, cli_path: str, rest: List[str]) -> None:
workspace = basedir / 'workspace'

args = [
'test', '-timeout=1800s', '-bench=.', './...',
'test', '-timeout=2700s', '-bench=.', './...',
f'-binPath={binpath}',
f'-cliPath={cli_path}',
f'-workspace={workspace}',
Expand Down
Loading