Removed duplicated steps

Signed-off-by: Guian Gumpac <[email protected]>
valkey-io · Sep 18, 2024 · dcdffaa · dcdffaa
1 parent da6158d
commit dcdffaa
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/install-shared-dependencies/action.yml b/.github/workflows/install-shared-dependencies/action.yml
@@ -26,6 +26,12 @@ inputs:
       required: true
       type: string
 
+    use-cache:
+        description: "Uses installed Valkey from cache"
+        required: false
+        default: true
+        type: boolean
+
     github-token:
         description: "GITHUB_TOKEN, GitHub App installation access token"
         required: true
@@ -49,7 +55,7 @@ runs:
           run: |
               sudo apt update -y
               sudo apt install -y git gcc pkg-config openssl libssl-dev
-          
+
         - name: Install software dependencies for Ubuntu MUSL
           shell: bash
           if: "${{ contains(inputs.target, 'musl') }}"
@@ -77,3 +83,4 @@ runs:
           with:
               engine-version: ${{ inputs.engine-version }}
               target: ${{ inputs.target }}
+              use-cache: ${{ inputs.use-cache }}
diff --git a/.github/workflows/java-cd.yml b/.github/workflows/java-cd.yml
@@ -227,20 +227,6 @@ jobs:
                 with:
                     submodules: recursive
 
-            - name: Install Valkey server
-              uses: ./.github/workflows/install-valkey
-              with:
-                  engine-version: "7.2.5"
-                  target: ${{ matrix.host.TARGET }}
-                  use-cache: false
-
-            - name: Start Valkey server
-              run: |
-                  cd ~/valkey
-                  make
-                  cd src
-                  ./valkey-server &
-
             - name: Set up JDK
               uses: actions/setup-java@v4
               with:
@@ -251,15 +237,22 @@ jobs:
               uses: ./.github/workflows/install-shared-dependencies
               with:
                   os: ${{ matrix.host.OS }}
+                  engine-version: "7.2.5"
                   target: ${{ matrix.host.TARGET }}
                   github-token: ${{ secrets.GITHUB_TOKEN }}
+                  use-cache: false
 
             - name: Install protoc (protobuf)
               uses: arduino/setup-protoc@v3
               with:
                   version: "26.1"
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
 
+            - name: Start Valkey server
+              run: |
+                  cd ~/valkey
+                  ./valkey-server &
+
             - name: Test deployment
               working-directory: java
               run: |