Some fixes

valkey-io · Jun 27, 2024 · de551d8 · de551d8
1 parent fd4935c
commit de551d8
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 55 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -142,23 +142,18 @@ jobs:
                   git config --global --add safe.directory "$GITHUB_WORKSPACE"
                   git submodule update --init --recursive
 
-            - name: Install Valkey
-              uses: ./.github/workflows/install-valkey
-              with:
-                  engine-version: "7.2.5"
-                  target: "x86_64-unknown-linux-gnu"            
-
             - name: Install shared software dependencies
               uses: ./.github/workflows/install-shared-dependencies
               with:
                   os: "amazon-linux"
                   target: "x86_64-unknown-linux-gnu"
                   github-token: ${{ secrets.GITHUB_TOKEN }}
 
-            - name: Create a symbolic Link for redis6 binaries
-              run: |
-                  ln -s /usr/bin/redis6-server /usr/bin/redis-server
-                  ln -s /usr/bin/redis6-cli /usr/bin/redis-cli
+            - name: Install Valkey
+              uses: ./.github/workflows/install-valkey
+              with:
+                  engine-version: "7.2.5"
+                  target: "x86_64-unknown-linux-gnu"   
 
             - name: Install Go
               run: |

diff --git a/.github/workflows/install-valkey/action.yml b/.github/workflows/install-valkey/action.yml
@@ -58,11 +58,6 @@ runs:
               version1: ${{ inputs.engine-version }}
               version2: ${{ env.VALKEY_MIN_VERSION }}
 
-        - name: Display comparison result
-          shell: bash
-          run: |
-            echo "Comparison result: ${{ steps.is_valkey_release.outputs.result }}"
-
         - name: Verify Valkey installation and symlinks
           shell: bash
           run: | 

diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -158,12 +158,6 @@ jobs:
                   git config --global --add safe.directory "$GITHUB_WORKSPACE"
                   git submodule update --init --recursive
 
-            - name: Install Valkey
-              uses: ./.github/workflows/install-valkey
-              with:
-                  engine-version: "7.2.5"
-                  target: "x86_64-unknown-linux-gnu"      
-
             - name: Install shared software dependencies
               uses: ./.github/workflows/install-shared-dependencies
               with:
@@ -177,15 +171,16 @@ jobs:
                   version: "26.1"
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
 
-            - name: Create a symbolic Link for redis6 binaries
-              run: |
-                  ln -s /usr/bin/redis6-server /usr/bin/redis-server
-                  ln -s /usr/bin/redis6-cli /usr/bin/redis-cli
-
             - name: Install Java
               run: |
                   yum install -y java-${{ matrix.java }}
 
+            - name: Install Valkey
+              uses: ./.github/workflows/install-valkey
+              with:
+                  engine-version: "7.2.5"
+                  target: "x86_64-unknown-linux-gnu"  
+
             - name: Build rust part
               working-directory: java
               run: cargo build --release

diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
@@ -128,12 +128,6 @@ jobs:
             - name: Set up Homebrew
               uses: Homebrew/actions/setup-homebrew@master
 
-            - name: Install Valkey
-              uses: ./.github/workflows/install-valkey
-              with:
-                  engine-version: "7.2.5"
-                  target: "aarch64-apple-darwin"
-
             - name: Install NodeJS
               run: |
                   brew update
@@ -153,6 +147,12 @@ jobs:
                   target: "aarch64-apple-darwin"
                   github-token: ${{ secrets.GITHUB_TOKEN }}
 
+            - name: Install Valkey
+              uses: ./.github/workflows/install-valkey
+              with:
+                  engine-version: "7.2.5"
+                  target: "aarch64-apple-darwin"
+
             - name: Test compatibility
               run: npm test -- -t "set and get flow works"
               working-directory: ./node
@@ -176,12 +176,6 @@ jobs:
               run: |
                   git config --global --add safe.directory "$GITHUB_WORKSPACE"
                   git submodule update --init --recursive
-
-            - name: Install Valkey
-              uses: ./.github/workflows/install-valkey
-              with:
-                  engine-version: "7.2.5"
-                  target: "x86_64-unknown-linux-gnu"   
    
             - name: Install NodeJS
               run: |
@@ -194,6 +188,12 @@ jobs:
                   target: "x86_64-unknown-linux-gnu"
                   github-token: ${{ secrets.GITHUB_TOKEN }}
 
+            - name: Install Valkey
+              uses: ./.github/workflows/install-valkey
+              with:
+                  engine-version: "7.2.5"
+                  target: "x86_64-unknown-linux-gnu"   
+
             - name: Test compatibility
               run: npm test -- -t "set and get flow works"
               working-directory: ./node                   

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -154,19 +154,19 @@ jobs:
                   submodules: recursive
             - name: Set up Homebrew
               uses: Homebrew/actions/setup-homebrew@master
-
-            - name: Install Valkey
-              uses: ./.github/workflows/install-valkey
-              with:
-                  engine-version: "7.2.5"
-                  target: "aarch64-apple-darwin"
 
             - name: Build Python wrapper
               uses: ./.github/workflows/build-python-wrapper
               with:
                   os: "macos"
                   target: "aarch64-apple-darwin"
                   github-token: ${{ secrets.GITHUB_TOKEN }}
+
+            - name: Install Valkey
+              uses: ./.github/workflows/install-valkey
+              with:
+                  engine-version: "7.2.5"
+                  target: "aarch64-apple-darwin"
 
             - name: Test compatibility with pytest
               working-directory: ./python
@@ -194,12 +194,6 @@ jobs:
                   git config --global --add safe.directory "$GITHUB_WORKSPACE"
                   git submodule update --init --recursive
 
-            - name: Install Valkey
-              uses: ./.github/workflows/install-valkey
-              with:
-                  engine-version: "7.2.5"
-                  target: "x86_64-unknown-linux-gnu"    
-
             - name: Install python
               run: |
                   yum install -y python3
@@ -211,11 +205,11 @@ jobs:
                   target: "x86_64-unknown-linux-gnu"
                   github-token: ${{ secrets.GITHUB_TOKEN }}
 
-            - name: Create a symbolic Link for redis6 binaries
-              working-directory: ./python
-              run: |
-                  ln -s /usr/bin/redis6-server /usr/bin/redis-server
-                  ln -s /usr/bin/redis6-cli /usr/bin/redis-cli
+            - name: Install Valkey
+              uses: ./.github/workflows/install-valkey
+              with:
+                  engine-version: "7.2.5"
+                  target: "x86_64-unknown-linux-gnu"
 
             - name: Test compatibility with pytest
               working-directory: ./python