Skip to content

Commit

Permalink
Merge branch 'unstable' into add_histogram
Browse files Browse the repository at this point in the history
  • Loading branch information
PragmaTwice authored Jan 18, 2025
2 parents a934a49 + 2afb56c commit b2f9fc1
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion .github/workflows/kvrocks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,10 @@ jobs:
os: ubuntu-22.04
compiler: clang
new_encoding: -DENABLE_NEW_ENCODING=FALSE
- name: Ubuntu Arm64
os: ubuntu-24.04-arm
compiler: auto
arm_linux: true

runs-on: ${{ matrix.os }}
env:
Expand All @@ -212,11 +216,15 @@ jobs:
echo "NPROC=$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
echo "CMAKE_EXTRA_DEFS=-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl" >> $GITHUB_ENV
- name: Setup Linux
if: ${{ startsWith(matrix.os, 'ubuntu') }}
if: ${{ startsWith(matrix.os, 'ubuntu') || matrix.arm_linux }}
run: |
sudo apt update
sudo apt install -y ninja-build
echo "NPROC=$(nproc)" >> $GITHUB_ENV
- name: Setup Linux ARM64
if: ${{ matrix.arm_linux }}
run: |
sudo apt install -y git build-essential cmake libtool python3 python3-pip libssl-dev
- name: Cache redis
id: cache-redis
Expand Down Expand Up @@ -245,6 +253,7 @@ jobs:
with:
fetch-depth: 0
- uses: actions/setup-python@v5
if: ${{ !matrix.arm_linux }}
with:
python-version: 3.x
- uses: actions/setup-go@v5
Expand Down

0 comments on commit b2f9fc1

Please sign in to comment.