Remove Redis installation from CI workflows and standardize engine in…

…stallation Signed-off-by: avifenesh <[email protected]>
valkey-io · Dec 26, 2024 · 1ba8885 · 1ba8885
1 parent c6e815c
commit 1ba8885
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 32 deletions.
diff --git a/.github/workflows/npm-cd.yml b/.github/workflows/npm-cd.yml
@@ -309,23 +309,24 @@ jobs:
               run: sudo chown -R $USER:$USER /home/ubuntu/action-runner-ilia/_work/valkey-glide
 
 
-            - name: install Redis and git for alpine
+            - name: install and git for alpine
               if: ${{ contains(matrix.build.TARGET, 'musl') }}
               run: |
                   apk update
-                  apk add redis git
+                  apk add git
                   node -v
 
-            - name: install Redis and Python for ubuntu
+            - name: install Python for ubuntu
               if: ${{ contains(matrix.build.TARGET, 'linux-gnu') }}
               run: |
                   sudo apt-get update
-                  sudo apt-get install redis-server python3
+                  sudo apt-get install python3
 
-            - name: install Redis, Python for macos
-              if: ${{ contains(matrix.build.RUNNER, 'mac') }}
-              run: |
-                  brew install redis python3
+            - name: Install engine
+              uses: ./.github/workflows/install-engine
+              with:
+                  engine-version: "8.0"
+                  target: ${{ matrix.build.target }}
 
             - name: Checkout
               if: ${{  matrix.build.TARGET != 'aarch64-unknown-linux-musl'}}

diff --git a/.github/workflows/pypi-cd.yml b/.github/workflows/pypi-cd.yml
@@ -233,31 +233,12 @@ jobs:
               with:
                   python-version: 3.12
 
-            - name: Install engine Ubuntu ARM
-              if: ${{ matrix.build.TARGET == 'aarch64-unknown-linux-gnu' }}
-              shell: bash
-              # in self hosted runner we first want to check that engine is not already installed
-              run: |
-                  if [[ $(`which redis-server`) == '' ]]
-                  then
-                    sudo apt-get update
-                    sudo apt-get install -y redis-server
-                  else
-                    echo "Redis is already installed"
-                  fi
-
-            - name: Install engine Ubuntu x86
-              if: ${{ matrix.build.TARGET == 'x86_64-unknown-linux-gnu' }}
-              shell: bash
-              run: |
-                  sudo apt-get update
-                  sudo apt-get install -y redis-server
+            - name: Install engine
+              uses: ./.github/workflows/install-engine
+              with:
+                  engine-version: "8.0"
+                  target: ${{ matrix.build.target }}
 
-            - name: Install engine MacOS
-              if: ${{ matrix.build.OS == 'macos' }}
-              shell: bash
-              run: |
-                  brew install redis
 
             - name: Check if RC and set a distribution tag for the package
               shell: bash