Merge branch 'release-1.2'

Signed-off-by: ikolomi <[email protected]>
valkey-io · Dec 1, 2024 · 5b9fe12 · 5b9fe12
2 parents 8ac276c + 031dfe5
commit 5b9fe12
Show file tree

Hide file tree

Showing 255 changed files with 71,012 additions and 1,695 deletions.
diff --git a/.github/DEVELOPER.md b/.github/DEVELOPER.md
@@ -133,7 +133,7 @@ We use dynamic matrices for our CI/CD workflows, which are created using the `cr
 4. It generates three matrices:
     - Engine matrix: Defines the types and versions of the engine to test against, for example Valkey 7.2.5.
     - Host matrix: Defines the host platforms to run the tests on, for example Ubuntu on ARM64.
-    - Language-version matrix: Defines the supported versions of languages, for example python 3.8.
+    - Language-version matrix: Defines the supported versions of languages, for example python 3.9.
 
 #### Outputs
 

diff --git a/.github/json_matrices/build-matrix.json b/.github/json_matrices/build-matrix.json
@@ -16,22 +16,12 @@
         "ARCH": "arm64",
         "TARGET": "aarch64-unknown-linux-gnu",
         "PACKAGE_MANAGERS": ["pypi", "npm", "maven"],
-        "CONTAINER": "2_28",
         "languages": ["python", "node", "java", "go", "dotnet"]
     },
     {
         "OS": "macos",
         "NAMED_OS": "darwin",
-        "RUNNER": "macos-12",
-        "ARCH": "x64",
-        "TARGET": "x86_64-apple-darwin",
-        "PACKAGE_MANAGERS": ["pypi", "npm", "maven"],
-        "languages": ["python", "node", "java", "go", "dotnet"]
-    },
-    {
-        "OS": "macos",
-        "NAMED_OS": "darwin",
-        "RUNNER": "macos-latest",
+        "RUNNER": "macos-14",
         "ARCH": "arm64",
         "TARGET": "aarch64-apple-darwin",
         "PACKAGE_MANAGERS": ["pypi", "npm", "maven"],
@@ -43,7 +33,7 @@
         "ARCH": "arm64",
         "TARGET": "aarch64-unknown-linux-musl",
         "RUNNER": ["self-hosted", "Linux", "ARM64"],
-        "IMAGE": "node:lts-alpine3.19",
+        "IMAGE": "node:lts-alpine",
         "CONTAINER_OPTIONS": "--user root --privileged --rm",
         "PACKAGE_MANAGERS": ["npm"],
         "languages": ["node"]
@@ -54,7 +44,7 @@
         "ARCH": "x64",
         "TARGET": "x86_64-unknown-linux-musl",
         "RUNNER": "ubuntu-latest",
-        "IMAGE": "node:lts-alpine3.19",
+        "IMAGE": "node:lts-alpine",
         "CONTAINER_OPTIONS": "--user root --privileged",
         "PACKAGE_MANAGERS": ["npm"],
         "languages": ["node"]

diff --git a/.github/json_matrices/supported-languages-versions.json b/.github/json_matrices/supported-languages-versions.json
@@ -6,13 +6,13 @@
     },
     {
         "language": "python",
-        "versions": ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
-        "always-run-versions": ["3.8", "3.13"]
+        "versions": ["3.9", "3.10", "3.11", "3.12", "3.13"],
+        "always-run-versions": ["3.9", "3.13"]
     },
     {
         "language": "node",
-        "versions": ["16.x", "17.x", "18.x", "19.x", "20.x"],
-        "always-run-versions": ["16.x", "20.x"]
+        "versions": ["16.x", "17.x", "18.x", "19.x", "20.x", "21.x", "22.x"],
+        "always-run-versions": ["16.x", "22.x"]
     },
     {
         "language": "dotnet",

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -8,13 +8,15 @@ on:
             - "v.?[0-9]+.[0-9]+"
             - "v?[0-9]+.[0-9]+.[0-9]+"
             - "v?[0-9]+.[0-9]+"
+            - release-*
     pull_request:
         branches:
             - "main"
             - "v.?[0-9]+.[0-9]+.[0-9]+"
             - "v.?[0-9]+.[0-9]+"
             - "v?[0-9]+.[0-9]+.[0-9]+"
             - "v?[0-9]+.[0-9]+"
+            - release-*
     schedule:
         - cron: "37 18 * * 6"
 

diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml
@@ -9,8 +9,8 @@ on:
         paths:
             - csharp/**
             - glide-core/src/**
+            - glide-core/redis-rs/redis/src/**
             - utils/cluster_manager.py
-            - submodules/**
             - .github/workflows/csharp.yml
             - .github/workflows/install-shared-dependencies/action.yml
             - .github/workflows/test-benchmark/action.yml
@@ -22,7 +22,7 @@ on:
         paths:
             - csharp/**
             - glide-core/src/**
-            - submodules/**
+            - glide-core/redis-rs/redis/src/**
             - utils/cluster_manager.py
             - .github/workflows/csharp.yml
             - .github/workflows/install-shared-dependencies/action.yml
@@ -87,8 +87,6 @@ jobs:
 
         steps:
             - uses: actions/checkout@v4
-              with:
-                  submodules: recursive
 
             - name: Set up dotnet ${{ matrix.dotnet }}
               uses: actions/setup-dotnet@v4
@@ -198,8 +196,6 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
-              with:
-                  submodules: recursive
 
             - name: lint rust
               uses: ./.github/workflows/lint-rust

diff --git a/.github/workflows/full-matrix-tests.yml b/.github/workflows/full-matrix-tests.yml
@@ -59,11 +59,11 @@ jobs:
         name: Run CI for GLIDE core lib
         secrets: inherit
 
-    # run-full-tests-for-redis-rs:
-    #     if: (github.repository_owner == 'valkey-io' && github.event_name == 'schedule') || (github.event_name == 'workflow_dispatch' && inputs.redis-rs == true)
-    #     uses: ./.github/workflows/redis-rs.yml
-    #     name: Run CI for Redis-RS client
-    #     secrets: inherit
+    run-full-tests-for-redis-rs:
+        if: (github.repository_owner == 'valkey-io' && github.event_name == 'schedule') || (github.event_name == 'workflow_dispatch' && inputs.redis-rs == true)
+        uses: ./.github/workflows/redis-rs.yml
+        name: Run CI for Redis-RS client
+        secrets: inherit
 
     run-full-tests-for-java:
         if: (github.repository_owner == 'valkey-io' && github.event_name == 'schedule') || (github.event_name == 'workflow_dispatch' && inputs.java == true)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -8,7 +8,7 @@ on:
             - v*
         paths:
             - glide-core/src/**
-            - submodules/**
+            - glide-core/redis-rs/redis/src/**
             - utils/cluster_manager.py
             - go/**
             - .github/workflows/go.yml
@@ -21,7 +21,7 @@ on:
     pull_request:
         paths:
             - glide-core/src/**
-            - submodules/**
+            - glide-core/redis-rs/redis/src/**
             - utils/cluster_manager.py
             - go/**
             - .github/workflows/go.yml
@@ -84,8 +84,6 @@ jobs:
 
         steps:
             - uses: actions/checkout@v4
-              with:
-                  submodules: recursive
 
             - name: Set up Go ${{ matrix.go }}
               uses: actions/setup-go@v5
@@ -136,8 +134,6 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
-              with:
-                  submodules: recursive
 
             - uses: ./.github/workflows/lint-rust
               with:

diff --git a/.github/workflows/install-shared-dependencies/action.yml b/.github/workflows/install-shared-dependencies/action.yml
@@ -25,7 +25,6 @@ inputs:
         description: "Engine version to install"
         required: false
         type: string
-
     github-token:
         description: "GITHUB_TOKEN, GitHub App installation access token"
         required: true
@@ -39,7 +38,7 @@ runs:
           if: "${{ inputs.os == 'macos' }}"
           run: |
               brew update
-              brew install git openssl coreutils
+              brew install openssl coreutils
 
         - name: Install software dependencies for Ubuntu GNU
           shell: bash

diff --git a/.github/workflows/java-cd.yml b/.github/workflows/java-cd.yml
@@ -86,9 +86,6 @@ jobs:
                     echo "No cleaning needed"
                   fi
             - uses: actions/checkout@v4
-              with:
-                  submodules: recursive
-
             - name: Set up JDK
               uses: actions/setup-java@v4
               with:
@@ -230,8 +227,6 @@ jobs:
         steps:
             - name: Checkout
               uses: actions/checkout@v4
-              with:
-                  submodules: recursive
 
             - name: Set up JDK
               uses: actions/setup-java@v4

diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -8,7 +8,7 @@ on:
             - v*
         paths:
             - glide-core/src/**
-            - submodules/**
+            - glide-core/redis-rs/redis/src/**
             - java/**
             - utils/cluster_manager.py
             - .github/workflows/java.yml
@@ -22,7 +22,7 @@ on:
     pull_request:
         paths:
             - glide-core/src/**
-            - submodules/**
+            - glide-core/redis-rs/redis/src/**
             - java/**
             - utils/cluster_manager.py
             - .github/workflows/java.yml
@@ -83,8 +83,6 @@ jobs:
 
         steps:
             - uses: actions/checkout@v4
-              with:
-                  submodules: recursive
 
             - uses: gradle/actions/wrapper-validation@v3
 
@@ -117,6 +115,7 @@ jobs:
               run: ./gradlew spotlessDiagnose | grep 'All formatters are well behaved for all files'
 
             - uses: ./.github/workflows/test-benchmark
+              if: ${{ matrix.engine.version == '8.0' && matrix.host.RUNNER == 'ubuntu-latest' && matrix.java == '17' }}
               with:
                   language-flag: -java
 
@@ -208,8 +207,6 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
-              with:
-                  submodules: recursive
 
             - uses: ./.github/workflows/lint-rust
               with:
@@ -218,18 +215,16 @@ jobs:
               name: lint java rust
 
     test-modules:
-        if: github.event.pull_request.head.repo.owner.login == 'valkey-io'
+        if: (github.repository_owner == 'valkey-io' && github.event_name == 'workflow_dispatch') || github.event.pull_request.head.repo.owner.login == 'valkey-io'
         environment: AWS_ACTIONS
-        name: Running Module Tests
+        name: Modules Tests
         runs-on: [self-hosted, linux, ARM64]
         timeout-minutes: 15
         steps:
             - name: Setup self-hosted runner access
               run: sudo chown -R $USER:$USER /home/ubuntu/actions-runner/_work/valkey-glide
 
             - uses: actions/checkout@v4
-              with:
-                  submodules: recursive
 
             - name: Set up JDK
               uses: actions/setup-java@v4

diff --git a/.github/workflows/lint-rust/action.yml b/.github/workflows/lint-rust/action.yml
@@ -14,8 +14,6 @@ runs:
     using: "composite"
     steps:
         - uses: actions/checkout@v4
-          with:
-              submodules: recursive
 
         - name: Install Rust toolchain and protoc
           uses: ./.github/workflows/install-rust-and-protoc
@@ -39,7 +37,7 @@ runs:
 
         - run: |
               cargo update
-              cargo install --locked --version 0.15.1 cargo-deny
+              cargo install --locked cargo-deny
               cargo deny check --config ${GITHUB_WORKSPACE}/deny.toml
           working-directory: ${{ inputs.cargo-toml-folder }}
           shell: bash