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

ci: Update MacOS runner to macos13 #2324

Merged
merged 14 commits into from
Jul 14, 2024
+17 −18
Merged

ci: Update MacOS runner to macos13 #2324

Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
33b60d3
Update kvrocks.yaml
aleksraiden May 20, 2024
657bc81
Merge branch 'unstable' into aleksraiden-patch-ci-macos11
aleksraiden Jun 3, 2024
5f5e630
Update kvrocks.yaml
aleksraiden Jun 3, 2024
008df36
Merge branch 'unstable' into aleksraiden-patch-ci-macos11
aleksraiden Jun 4, 2024
bab945b
Apply suggestions from code review
PragmaTwice Jun 29, 2024
574a69f
Merge branch 'unstable' into aleksraiden-patch-ci-macos11
PragmaTwice Jun 29, 2024
afb9251
Merge branch 'unstable' into aleksraiden-patch-ci-macos11
tisonkun Jul 3, 2024
0654c44
Merge branch 'unstable' into aleksraiden-patch-ci-macos11
aleksraiden Jul 8, 2024
7acf5dd
Update bitmap_test.go
aleksraiden Jul 10, 2024
9561ccb
Merge branch 'unstable' into aleksraiden-patch-ci-macos11
aleksraiden Jul 10, 2024
48989ba
Merge branch 'unstable' into aleksraiden-patch-ci-macos11
aleksraiden Jul 10, 2024
184fff5
Update bitmap_test.go
aleksraiden Jul 10, 2024
f88aea5
Update x.py
aleksraiden Jul 11, 2024
734ce71
Merge branch 'unstable' into aleksraiden-patch-ci-macos11
PragmaTwice Jul 14, 2024
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
10 changes: 5 additions & 5 deletions .github/workflows/kvrocks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,21 +111,21 @@ jobs:
matrix:
include:
- name: Darwin Clang
os: macos-11
os: macos-12
PragmaTwice marked this conversation as resolved.
Show resolved Hide resolved
compiler: auto
- name: Darwin Clang arm64
os: macos-14
compiler: auto
- name: Darwin Clang without Jemalloc
os: macos-11
os: macos-12
PragmaTwice marked this conversation as resolved.
Show resolved Hide resolved
compiler: auto
without_jemalloc: -DDISABLE_JEMALLOC=ON
- name: Darwin Clang with OpenSSL
os: macos-11
os: macos-12
PragmaTwice marked this conversation as resolved.
Show resolved Hide resolved
compiler: auto
with_openssl: -DENABLE_OPENSSL=ON
- name: Darwin Clang without luaJIT
os: macos-11
os: macos-12
PragmaTwice marked this conversation as resolved.
Show resolved Hide resolved
compiler: auto
without_luajit: -DENABLE_LUAJIT=OFF
- name: Ubuntu GCC
Expand Down Expand Up @@ -211,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
Loading