From b57b186d5fb73da19d13b5b4be35829d92ab7af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= <bjorn.a.svensson@est.tech>
Date: Fri, 11 Oct 2024 08:52:11 +0200
Subject: [PATCH] Install the Valkey package in CI when available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Björn Svensson <bjorn.a.svensson@est.tech>
---
 .github/workflows/build.yml |  7 +------
 .github/workflows/ci.yml    | 29 +++++++++++------------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2e34783..c32d002 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -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:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 71a00c0..0f63682 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,10 +58,15 @@ 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 }}
@@ -95,12 +100,8 @@ jobs:
       - name: Prepare
         uses: awalsh128/cache-apt-pkgs-action@a6c3917cc929dd0345bfb2d3feaf9101823370ad # v1.4.2
         with:
-          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
+          packages: libevent-dev valgrind valkey
+          version: 1.1
       - name: Build
         run: USE_TLS=1 TEST_ASYNC=1 make
       - name: Run tests
@@ -125,12 +126,8 @@ jobs:
       - name: Prepare
         uses: awalsh128/cache-apt-pkgs-action@a6c3917cc929dd0345bfb2d3feaf9101823370ad # v1.4.2
         with:
-          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
+          packages: gcc-multilib valkey
+          version: 1.1
       - name: Build
         run: |
           make 32bit
@@ -179,11 +176,7 @@ jobs:
     steps:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - name: Install dependencies
-        run: brew install ninja
-      - name: Install Valkey for non-cluster tests
-        run: |
-          git clone --depth 1 --branch 7.2.5 https://github.com/valkey-io/valkey.git
-          cd valkey && BUILD_TLS=yes make install
+        run: brew install ninja valkey
       - name: Build using CMake
         run: |
           mkdir build && cd build