Merge branch 'valkey-io:main' into main

avifenesh · Aug 31, 2024 · 16094d6 · 16094d6
2 parents ea64fdd + 1f7e55f
commit 16094d6
Show file tree

Hide file tree

Showing 168 changed files with 45,546 additions and 18,711 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -95,6 +95,10 @@ body:
       options:
         - TypeScript
         - Python
+        - Java
+        - Rust
+        - Go
+        - .Net
     validations:
       required: true
 
@@ -111,7 +115,7 @@ body:
     attributes:
       label: Cluster information
       description: |
-       Cluster information, cluster topology, number of shards, number of replicas, used data types.
+        Cluster information, cluster topology, number of shards, number of replicas, used data types.
     validations:
       required: false
 

diff --git a/.github/json_matrices/engine-matrix.json b/.github/json_matrices/engine-matrix.json
@@ -2,5 +2,9 @@
   {
     "type": "valkey",
     "version": "7.2.5"
+  },
+  {
+    "type": "valkey",
+    "version": "8.0.0-rc1"
   }
 ]
diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml
@@ -24,6 +24,7 @@ on:
             - .github/workflows/lint-rust/action.yml
             - .github/workflows/install-valkey/action.yml
             - .github/json_matrices/build-matrix.json
+    workflow_dispatch:
 
 permissions:
     contents: read

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -24,11 +24,12 @@ on:
             - .github/workflows/lint-rust/action.yml
             - .github/workflows/install-valkey/action.yml
             - .github/json_matrices/build-matrix.json
+    workflow_dispatch:
+
 concurrency:
     group: go-${{ github.head_ref || github.ref }}
     cancel-in-progress: true
 
-
 jobs:
     load-engine-matrix:
       runs-on: ubuntu-latest
@@ -51,7 +52,6 @@ jobs:
             fail-fast: false
             matrix:
                 go:
-                    # - '1.18.10'
                     - '1.22.0'
                 engine: ${{ fromJson(needs.load-engine-matrix.outputs.matrix) }}
                 host:
@@ -105,7 +105,22 @@ jobs:
 
             - name: Run tests
               working-directory: ./go
-              run: make test
+              run: |
+                make test
+
+            - uses: ./.github/workflows/test-benchmark
+              with:
+                  language-flag: -go
+
+            - name: Upload logs and reports
+              if: always()
+              continue-on-error: true
+              uses: actions/upload-artifact@v4
+              with:
+                  name: reports-go-${{ matrix.go }}-redis-${{ matrix.redis }}-${{ matrix.os }}
+                  path: |
+                      utils/clusters/**
+                      benchmarks/results/**
 
     build-amazonlinux-latest:
         if: github.repository_owner == 'valkey-io'
@@ -114,7 +129,6 @@ jobs:
             fail-fast: false
             matrix:
                 go:
-                    - 1.18.10
                     - 1.22.0
         runs-on: ubuntu-latest
         container: amazonlinux:latest
@@ -157,6 +171,9 @@ jobs:
               working-directory: ./go
               run: make install-tools-go${{ matrix.go }}
 
+            - name: Set LD_LIBRARY_PATH
+              run: echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/go/target/release/deps/" >> $GITHUB_ENV
+
             - name: Build client
               working-directory: ./go
               run: make build
@@ -167,7 +184,17 @@ jobs:
 
             - name: Run tests
               working-directory: ./go
-              run: make test
+              run: |
+                make test
+
+            - name: Upload cluster manager logs
+              if: always()
+              continue-on-error: true
+              uses: actions/upload-artifact@v4
+              with:
+                  name: cluster-manager-logs-${{ matrix.go }}-redis-6-amazonlinux
+                  path: |
+                      utils/clusters/**
 
     lint-rust:
         timeout-minutes: 15

diff --git a/.github/workflows/install-shared-dependencies/action.yml b/.github/workflows/install-shared-dependencies/action.yml
@@ -63,7 +63,7 @@ runs:
           shell: bash
           if: "${{ inputs.os == 'amazon-linux' }}"
           run: |
-              yum install -y gcc pkgconfig openssl openssl-devel which curl gettext --allowerasing
+              yum install -y gcc pkgconfig openssl openssl-devel which curl gettext tar --allowerasing
 
         - name: Install Rust toolchain and protoc
           if: "${{ !contains(inputs.target, 'musl') }}"

diff --git a/.github/workflows/install-valkey/action.yml b/.github/workflows/install-valkey/action.yml
@@ -62,6 +62,7 @@ runs:
             echo 'export PATH=/usr/local/bin:$PATH' >>~/.bash_profile
 
         - name: Verify Valkey installation and symlinks
+          if: ${{ !contains(inputs.engine-version, '-rc') }}
           shell: bash
           run: | 
             # In Valkey releases, the engine is built with symlinks from valkey-server and valkey-cli

diff --git a/.github/workflows/java-cd.yml b/.github/workflows/java-cd.yml
@@ -56,26 +56,21 @@ jobs:
                     OS: ubuntu,
                     RUNNER: ubuntu-latest,
                     TARGET: x86_64-unknown-linux-gnu,
-                    CLASSIFIER: linux-x86_64
                   }
                   - {
                     OS: ubuntu,
                     RUNNER: ["self-hosted", "Linux", "ARM64"],
                     TARGET: aarch64-unknown-linux-gnu,
-                    CLASSIFIER: linux-aarch_64,
-                    CONTAINER: "2_28"
                   }
                   - {
                     OS: macos,
                     RUNNER: macos-12,
                     TARGET: x86_64-apple-darwin,
-                    CLASSIFIER: osx-x86_64
                   }
                   - {
                     OS: macos,
                     RUNNER: macos-latest,
                     TARGET: aarch64-apple-darwin,
-                    CLASSIFIER: osx-aarch_64
                   }
 
         runs-on: ${{ matrix.host.RUNNER }}
@@ -99,7 +94,7 @@ jobs:
             - name: Set the release version
               shell: bash
               run: |
-                  if ${{ github.event_name == 'pull_request' || github.event_name == 'push' }}; then
+                  if ${{ github.event_name == 'pull_request' }}; then
                     R_VERSION="255.255.255"
                   elif ${{ github.event_name == 'workflow_dispatch' }}; then
                     R_VERSION="${{ env.INPUT_VERSION }}"
@@ -139,18 +134,12 @@ jobs:
               env:
                   SECRING_GPG: ${{ secrets.SECRING_GPG }}
 
-            - name: Replace placeholders and version in build.gradle
-              shell: bash
-              working-directory: ./java/client
-              run: |
-                  SED_FOR_MACOS=`if [[ "${{ matrix.host.os }}" =~ .*"macos".*  ]]; then echo "''"; fi`
-                  sed -i $SED_FOR_MACOS 's/placeholder/${{ matrix.host.CLASSIFIER }}/g' build.gradle
-                  sed -i $SED_FOR_MACOS "s/255.255.255/${{ env.RELEASE_VERSION }}/g" build.gradle
-
             - name: Build java client
               working-directory: java
               run: |
                   ./gradlew :client:publishToMavenLocal -Psigning.secretKeyRingFile=secring.gpg -Psigning.password="${{ secrets.GPG_PASSWORD }}" -Psigning.keyId=${{ secrets.GPG_KEY_ID }}
+              env:
+                  GLIDE_RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
 
             - name: Bundle JAR
               working-directory: java
@@ -160,12 +149,12 @@ jobs:
                   jar -cvf bundle.jar *
                   ls -ltr
                   cd -
-                  cp $src_folder/bundle.jar .
+                  cp $src_folder/bundle.jar bundle-${{ matrix.host.TARGET }}.jar
 
             - name: Upload artifacts to publish
               continue-on-error: true
               uses: actions/upload-artifact@v4
               with:
                   name: java-${{ matrix.host.TARGET }}
                   path: |
-                      java/bundle.jar
+                      java/bundle*.jar
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -24,6 +24,7 @@ on:
             - .github/workflows/lint-rust/action.yml
             - .github/workflows/install-valkey/action.yml
             - .github/json_matrices/build-matrix.json
+    workflow_dispatch:
 
 concurrency:
     group: java-${{ github.head_ref || github.ref }}
@@ -97,7 +98,7 @@ jobs:
 
             - name: Build java client
               working-directory: java
-              run: ./gradlew --continue build
+              run: ./gradlew --continue build -x javadoc
 
             - name: Ensure no skipped files by linter
               working-directory: java
@@ -165,22 +166,18 @@ jobs:
 
             - name: Install Java
               run: |
-                  yum install -y java-${{ matrix.java }}
+                  yum install -y java-${{ matrix.java }}-amazon-corretto-devel.x86_64
 
-            - name: Build rust part
+            - name: Build java wrapper
               working-directory: java
-              run: cargo build --release
-
-            - name: Build java part
-              working-directory: java
-              run: ./gradlew --continue build
+              run: ./gradlew --continue build -x javadoc
 
             - name: Upload test & spotbugs reports
               if: always()
               continue-on-error: true
               uses: actions/upload-artifact@v4
               with:
-                  name: test-reports-${{ matrix.java }}
+                  name: test-reports-${{ matrix.java }}-amazon-linux
                   path: |
                       java/client/build/reports/**
                       java/integTest/build/reports/**

diff --git a/.github/workflows/lint-rust/action.yml b/.github/workflows/lint-rust/action.yml
@@ -42,7 +42,7 @@ runs:
 
         - run: |
               cargo update
-              cargo install cargo-deny
+              cargo install --locked --version 0.15.1 cargo-deny
               cargo deny check --config ${GITHUB_WORKSPACE}/deny.toml
           working-directory: ${{ inputs.cargo-toml-folder }}
           shell: bash

diff --git a/.github/workflows/lint-ts.yml b/.github/workflows/lint-ts.yml
@@ -14,6 +14,7 @@ on:
             - node/**
             - benchmarks/utilities/*
             - .github/workflows/lint-ts.yml
+    workflow_dispatch:
 
 concurrency:
     group: node-lint-${{ github.head_ref || github.ref }}