Skip to content

Commit

Permalink
Install the Valkey package when available in CI
Browse files Browse the repository at this point in the history
Signed-off-by: Björn Svensson <[email protected]>
  • Loading branch information
bjosv committed Oct 13, 2024
1 parent daf8537 commit 732e25f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 15 deletions.
7 changes: 1 addition & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,7 @@ jobs:
dnf -y install https://rpms.remirepo.net/enterprise/remi-release-8.rpm
dnf -y module install redis:remi-6.0
dnf -y group install "Development Tools"
dnf -y install openssl-devel cmake libevent-devel
- name: Install Valkey
run: |
git clone --depth 1 --branch 7.2.5 https://github.com/valkey-io/valkey.git
cd valkey && BUILD_TLS=yes make install
dnf -y install openssl-devel cmake libevent-devel valkey
- name: Build using cmake
env:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,14 @@ jobs:
uses: jwlawson/actions-setup-cmake@802fa1a2c4e212495c05bf94dba2704a92a472be # v2.0.2
with:
cmake-version: ${{ matrix.cmake-version }}
- name: Install Valkey for non-cluster tests
- name: Build and install Valkey for non-cluster tests
if: ${{ matrix.runner == 'ubuntu-20.04' }}
run: |
git clone --depth 1 --branch 7.2.5 https://github.com/valkey-io/valkey.git
cd valkey && BUILD_TLS=yes make install
- name: Install Valkey for non-cluster tests
if: ${{ matrix.runner != 'ubuntu-20.04' }}
run: sudo apt install valkey
- name: Generate makefiles
env:
CC: ${{ matrix.compiler }}
Expand Down Expand Up @@ -89,7 +93,7 @@ jobs:

ubuntu-make:
name: Build with make
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- name: Prepare
Expand All @@ -98,9 +102,7 @@ jobs:
packages: libevent-dev valgrind
version: 1.0
- name: Install Valkey
run: |
git clone --depth 1 --branch 7.2.5 https://github.com/valkey-io/valkey.git
cd valkey && sudo BUILD_TLS=yes make install
run: sudo apt install valkey
- name: Build
run: USE_TLS=1 TEST_ASYNC=1 make
- name: Run tests
Expand All @@ -119,7 +121,7 @@ jobs:

ubuntu-32bit:
name: Build for 32-bit
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- name: Prepare
Expand All @@ -128,9 +130,7 @@ jobs:
packages: gcc-multilib
version: 1.0
- name: Install Valkey
run: |
git clone --depth 1 --branch 7.2.5 https://github.com/valkey-io/valkey.git
cd valkey && sudo BUILD_TLS=yes make install
run: sudo apt install valkey
- name: Build
run: |
make 32bit
Expand Down

0 comments on commit 732e25f

Please sign in to comment.