Addressed PR comments

Signed-off-by: Guian Gumpac <guian.gumpac@improving.com>
valkey-io · Sep 19, 2024 · 0b5cc6c · 0b5cc6c
1 parent f3dc0ba
commit 0b5cc6c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 40 deletions.
diff --git a/.github/workflows/install-shared-dependencies/action.yml b/.github/workflows/install-shared-dependencies/action.yml
@@ -31,12 +31,6 @@ inputs:
         required: true
         type: string
 
-    use-cache:
-        description: "Uses installed Valkey from cache"
-        required: false
-        default: true
-        type: boolean
-
 
 runs:
     using: "composite"
@@ -54,7 +48,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') }}"
@@ -82,4 +76,3 @@ runs:
           with:
               engine-version: ${{ inputs.engine-version }}
               target: ${{ inputs.target }}
-              use-cache: ${{ inputs.use-cache }}
diff --git a/.github/workflows/install-valkey/action.yml b/.github/workflows/install-valkey/action.yml
@@ -16,11 +16,6 @@ inputs:
             - aarch64-apple-darwin
             - aarch64-unknown-linux-musl
             - x86_64-unknown-linux-musl
-    use-cache:
-        description: "Uses installed Valkey from cache"
-        required: false
-        default: true
-        type: boolean
 
 env:
     CARGO_TERM_COLOR: always
@@ -31,8 +26,8 @@ runs:
 
     steps:
         - name: Cache Valkey
-          # TODO: remove the musl ARM64 limitation when https://github.com/actions/runner/issues/801 is resolved
-          if: ${{ inputs.use-cache == true && inputs.target != 'aarch64-unknown-linux-musl' }}
+           # TODO: remove the musl ARM64 limitation when https://github.com/actions/runner/issues/801 is resolved
+          if: ${{ inputs.target != 'aarch64-unknown-linux-musl' }}
           uses: actions/cache@v4
           id: cache-valkey
           with:
@@ -43,7 +38,7 @@ runs:
         - name: Build Valkey
           if: ${{ steps.cache-valkey.outputs.cache-hit != 'true' }}
           shell: bash
-          run: |
+          run: | 
             echo "Building valkey ${{ inputs.engine-version }}"
             cd ~
             rm -rf valkey
@@ -69,7 +64,7 @@ runs:
         - name: Verify Valkey installation and symlinks
           if: ${{ !contains(inputs.engine-version, '-rc') }}
           shell: bash
-          run: |
+          run: | 
             # In Valkey releases, the engine is built with symlinks from valkey-server and valkey-cli
             # to redis-server and redis-cli. This step ensures that the engine is properly installed
             # with the expected version and that Valkey symlinks are correctly created.
@@ -81,4 +76,4 @@ runs:
             else
                 echo "Successfully installed the server: $INSTALLED_VER"
             fi
-
+ 
diff --git a/.github/workflows/java-cd.yml b/.github/workflows/java-cd.yml
@@ -212,7 +212,7 @@ jobs:
                   exit 1
 
     test-deployment-on-all-architectures:
-        needs: [set-release-version, load-platform-matrix, publish-to-maven-central-deployment]
+        needs: [ set-release-version, load-platform-matrix ]
         env:
             JAVA_VERSION: "11"
             RELEASE_VERSION: ${{ needs.set-release-version.outputs.RELEASE_VERSION }}
@@ -241,43 +241,29 @@ jobs:
                   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: Find available port
+            - name: Start standalone Valkey server
+              working-directory: utils
               id: port
               run: |
-                  if ${{ matrix.host.OS == 'ubuntu'}}; then
-                      sudo apt install net-tools
-                      while
-                        port=$(shuf -n 1 -i 40000-65000)
-                        netstat -atun | grep -q "$port"
-                      do
-                        continue
-                      done
-                  else
-                    export port=`comm -23 <(seq 49152 65535 | sort) <(awk '{print $4}' | cut -d':' -f2 | sort -u) | shuf | head -n 1`
-                  fi
-
-                  echo "PORT=$port" >> $GITHUB_OUTPUT
-
-            - name: Start Valkey server
-              run:
-                  cd ~/valkey/src
-                  ./valkey-server --port ${{ steps.port.outputs.PORT }}&
+                  PORT=$(python3 ./cluster_manager.py start -r 0 | tail -1 | sed 's/.*://')
+                  echo "PORT=$PORT" >> $GITHUB_OUTPUT
 
             - name: Test deployment
               working-directory: java
+              env:
+                  PORT: ${{ steps.port.outputs.PORT }}
               run: |
                   export ORG_GRADLE_PROJECT_centralManualTestingAuthHeaderName="Authorization"
                   export ORG_GRADLE_PROJECT_centralManualTestingAuthHeaderValue="Bearer $(echo "${{ secrets.CENTRAL_TOKEN_USERNAME }}:${{ secrets.CENTRAL_TOKEN_PASSWORD }}" | base64)"
                   export GLIDE_RELEASE_VERSION=${{ env.RELEASE_VERSION }}
-                  ./gradlew :benchmarks:run --args="--minimal --clients glide --port ${{ env.VALKEY_PORT }}"
+                  ./gradlew :benchmarks:run --args="--minimal --clients glide --port ${{ env.PORT }}"
 
     publish-release-to-maven:
         if: ${{ inputs.maven_publish == true || github.event_name == 'push' }}