This is an automated email from the ASF dual-hosted git repository.
twice pushed a commit to branch unstable
in repository https://gitbox.apache.org/repos/asf/kvrocks.git
The following commit(s) were added to refs/heads/unstable by this push:
new fd4b6e00 ci: Update MacOS runner to macos13 (#2324)
fd4b6e00 is described below
commit fd4b6e003d79412f7c71a5360daf36e1902b2e2a
Author: Aleks Lozovyuk <[email protected]>
AuthorDate: Sun Jul 14 09:24:18 2024 +0300
ci: Update MacOS runner to macos13 (#2324)
Co-authored-by: Twice <[email protected]>
Co-authored-by: tison <[email protected]>
---
.github/workflows/kvrocks.yaml | 33 ++++++++++++++++-----------------
x.py | 2 +-
2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml
index 06762033..22a3f0cd 100644
--- a/.github/workflows/kvrocks.yaml
+++ b/.github/workflows/kvrocks.yaml
@@ -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
@@ -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
diff --git a/x.py b/x.py
index 710534a2..1a1dcf97 100755
--- a/x.py
+++ b/x.py
@@ -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}',
