ci: Update MacOS runner to macos13 (#2324)

Co-authored-by: Twice <[email protected]> Co-authored-by: tison <[email protected]>
apache · Jul 14, 2024 · fd4b6e0 · fd4b6e0
1 parent 504322c
commit fd4b6e0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git 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
@@ -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}',