Ort fixup

.github/json_matrices/build-matrix.json

@@ -5,15 +5,27 @@
         "RUNNER": "ubuntu-latest",
         "ARCH": "x64",
         "TARGET": "x86_64-unknown-linux-gnu",
-        "PACKAGE_MANAGERS": ["pypi", "npm", "maven"]
+        "PACKAGE_MANAGERS": [
+            "pypi",
+            "npm",
+            "maven"
+        ]
     },
     {
         "OS": "ubuntu",
         "NAMED_OS": "linux",
-        "RUNNER": ["self-hosted", "Linux", "ARM64"],
+        "RUNNER": [
+            "self-hosted",
+            "Linux",
+            "ARM64"
+        ],
         "ARCH": "arm64",
         "TARGET": "aarch64-unknown-linux-gnu",
-        "PACKAGE_MANAGERS": ["pypi", "npm", "maven"],
+        "PACKAGE_MANAGERS": [
+            "pypi",
+            "npm",
+            "maven"
+        ],
         "CONTAINER": "2_28"
     },
     {
@@ -22,34 +34,50 @@
         "RUNNER": "macos-12",
         "ARCH": "x64",
         "TARGET": "x86_64-apple-darwin",
-        "PACKAGE_MANAGERS": ["pypi", "npm", "maven"]
+        "PACKAGE_MANAGERS": [
+            "pypi",
+            "npm",
+            "maven"
+        ]
     },
     {
         "OS": "macos",
         "NAMED_OS": "darwin",
         "RUNNER": "macos-latest",
         "ARCH": "arm64",
         "TARGET": "aarch64-apple-darwin",
-        "PACKAGE_MANAGERS": ["pypi", "npm", "maven"]
+        "PACKAGE_MANAGERS": [
+            "pypi",
+            "npm",
+            "maven"
+        ]
     },
     {
         "OS": "ubuntu",
         "NAMED_OS": "linux",
         "ARCH": "arm64",
         "TARGET": "aarch64-unknown-linux-musl",
-        "RUNNER": ["self-hosted", "Linux", "ARM64"],
-        "IMAGE": "node:alpine",
+        "RUNNER": [
+            "self-hosted",
+            "Linux",
+            "ARM64"
+        ],
+        "IMAGE": "node:lts-alpine3.19",
         "CONTAINER_OPTIONS": "--user root --privileged --rm",
-        "PACKAGE_MANAGERS": ["npm"]
+        "PACKAGE_MANAGERS": [
+            "npm"
+        ]
     },
     {
         "OS": "ubuntu",
         "NAMED_OS": "linux",
         "ARCH": "x64",
         "TARGET": "x86_64-unknown-linux-musl",
         "RUNNER": "ubuntu-latest",
-        "IMAGE": "node:alpine",
+        "IMAGE": "node:lts-alpine3.19",
         "CONTAINER_OPTIONS": "--user root --privileged",
-        "PACKAGE_MANAGERS": ["npm"]
+        "PACKAGE_MANAGERS": [
+            "npm"
+        ]
     }
 ]

.github/workflows/build-node-wrapper/action.yml

@@ -31,7 +31,7 @@ inputs:
         required: true
     engine-version:
         description: "Engine version to install"
-        required: true
+        required: false
         type: string
     publish:
         description: "Enable building the wrapper in release mode"

.github/workflows/codeql.yml

@@ -3,18 +3,20 @@ name: "CodeQL"
 on:
     push:
         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]+"
+            - "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-*
     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]+"
+            - "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"
 

.github/workflows/csharp.yml

@@ -2,11 +2,14 @@ name: C# tests
 
 on:
     push:
-        branches: ["main"]
+        branches:
+            - main
+            - release-*
+            - v*
         paths:
             - csharp/**
             - glide-core/src/**
-            - submodules/**
+            - glide-core/redis-rs/redis/src/**
             - .github/workflows/csharp.yml
             - .github/workflows/install-shared-dependencies/action.yml
             - .github/workflows/test-benchmark/action.yml
@@ -17,7 +20,7 @@ on:
         paths:
             - csharp/**
             - glide-core/src/**
-            - submodules/**
+            - glide-core/redis-rs/redis/src/**
             - .github/workflows/csharp.yml
             - .github/workflows/install-shared-dependencies/action.yml
             - .github/workflows/test-benchmark/action.yml
@@ -73,8 +76,7 @@ jobs:
 
         steps:
             - uses: actions/checkout@v4
-              with:
-                  submodules: recursive
+
 
             - name: Set up dotnet ${{ matrix.dotnet }}
               uses: actions/setup-dotnet@v4
@@ -119,8 +121,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
-              with:
-                  submodules: recursive
+
 
             - uses: ./.github/workflows/lint-rust
               with:

.github/workflows/go.yml

@@ -2,10 +2,13 @@ name: Go CI
 
 on:
     push:
-        branches: [ "main" ]
+        branches:
+            - main
+            - release-*
+            - v*
         paths:
             - glide-core/src/**
-            - submodules/**
+            - glide-core/redis-rs/redis/src/**
             - go/**
             - .github/workflows/go.yml
             - .github/workflows/install-shared-dependencies/action.yml
@@ -16,7 +19,7 @@ on:
     pull_request:
         paths:
             - glide-core/src/**
-            - submodules/**
+            - glide-core/redis-rs/redis/src/**
             - go/**
             - .github/workflows/go.yml
             - .github/workflows/install-shared-dependencies/action.yml
@@ -70,8 +73,7 @@ jobs:
 
         steps:
             - uses: actions/checkout@v4
-              with:
-                  submodules: recursive
+
 
             - name: Set up Go ${{ matrix.go }}
               uses: actions/setup-go@v5
@@ -201,8 +203,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
-              with:
-                  submodules: recursive
+
 
             - uses: ./.github/workflows/lint-rust
               with:

.github/workflows/install-redis/action.yml

@@ -17,8 +17,7 @@ runs:
           shell: bash
 
         - uses: actions/checkout@v4
-          with:
-              submodules: recursive
+
 
         - uses: actions/cache@v3
           id: cache-redis

.github/workflows/install-shared-dependencies/action.yml

@@ -22,10 +22,9 @@ inputs:
             - aarch64-unknown-linux-musl
             - x86_64-unknown-linux-musl
     engine-version:
-      description: "Engine version to install"
-      required: true
-      type: string
-
+        description: "Engine version to install"
+        required: false
+        type: string
     github-token:
         description: "GITHUB_TOKEN, GitHub App installation access token"
         required: true
@@ -40,7 +39,7 @@ runs:
           if: "${{ inputs.os == 'macos' }}"
           run: |
               brew update
-              brew install git gcc pkgconfig openssl coreutils
+              brew install git openssl coreutils
 
         - name: Install software dependencies for Ubuntu GNU
           shell: bash
@@ -72,6 +71,7 @@ runs:
             github-token: ${{ inputs.github-token }}
 
         - name: Install Valkey
+          if: ${{ inputs.engine-version != '' }}
           uses: ./.github/workflows/install-valkey
           with:
               engine-version: ${{ inputs.engine-version }}

.github/workflows/java-cd.yml

@@ -86,8 +86,7 @@ jobs:
                     echo "No cleaning needed"
                   fi
             - uses: actions/checkout@v4
-              with:
-                  submodules: recursive
+
 
             - name: Set up JDK
               uses: actions/setup-java@v4
@@ -225,8 +224,7 @@ jobs:
         steps:
             - name: Checkout
               uses: actions/checkout@v4
-              with:
-                  submodules: recursive
+
 
             - name: Set up JDK
               uses: actions/setup-java@v4

.github/workflows/java.yml

@@ -2,10 +2,13 @@ name: Java CI
 
 on:
     push:
-        branches: ["main"]
+        branches:
+            - main
+            - release-*
+            - v*
         paths:
             - glide-core/src/**
-            - submodules/**
+            - glide-core/redis-rs/redis/src/**
             - java/**
             - .github/workflows/java.yml
             - .github/workflows/install-shared-dependencies/action.yml
@@ -16,7 +19,7 @@ on:
     pull_request:
         paths:
             - glide-core/src/**
-            - submodules/**
+            - glide-core/redis-rs/redis/src/**
             - java/**
             - .github/workflows/java.yml
             - .github/workflows/install-shared-dependencies/action.yml
@@ -71,8 +74,7 @@ jobs:
 
         steps:
             - uses: actions/checkout@v4
-              with:
-                  submodules: recursive
+
 
             - uses: gradle/actions/wrapper-validation@v3
 
@@ -188,27 +190,25 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
-              with:
-                  submodules: recursive
+
 
             - uses: ./.github/workflows/lint-rust
               with:
                   cargo-toml-folder: ./java
               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

.github/workflows/lint-rust/action.yml

@@ -15,17 +15,14 @@ runs:
 
     steps:
         - uses: actions/checkout@v4
-          with:
-              submodules: recursive
+
 
         - name: Install Rust toolchain and protoc
           uses: ./.github/workflows/install-rust-and-protoc
           with:
               github-token: ${{ inputs.github-token }}
 
         - uses: Swatinem/rust-cache@v2
-          with:
-              github-token: ${{ inputs.github-token }}
 
         - run: cargo fmt --all -- --check
           working-directory: ${{ inputs.cargo-toml-folder }}
@@ -42,7 +39,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

.github/workflows/lint-ts.yml

@@ -2,7 +2,10 @@ name: lint-ts
 
 on:
     push:
-        branches: ["main"]
+        branches:
+            - main
+            - release-*
+            - v*
         paths:
             - benchmarks/node/**
             - node/**