Resolve merge conflicts with upstream/master

Author: ofekshenawa

.github/RELEASE_NOTES_TEMPLATE.md

@@ -0,0 +1,125 @@
+# Release Notes Template for go-redis
+
+This template provides a structured format for creating release notes for go-redis releases.
+
+## Format Structure
+
+```markdown
+# X.Y.Z (YYYY-MM-DD)
+
+## 🚀 Highlights
+
+### [Category Name]
+Brief description of the major feature/change with context and impact.
+- Key points
+- Performance metrics if applicable
+- Links to documentation
+
+### [Another Category]
+...
+
+## ✨ New Features
+
+- Feature description ([#XXXX](https://github.com/redis/go-redis/pull/XXXX)) by [@username](https://github.com/username)
+- ...
+
+## 🐛 Bug Fixes
+
+- Fix description ([#XXXX](https://github.com/redis/go-redis/pull/XXXX)) by [@username](https://github.com/username)
+- ...
+
+## ⚡ Performance
+
+- Performance improvement description ([#XXXX](https://github.com/redis/go-redis/pull/XXXX)) by [@username](https://github.com/username)
+- ...
+
+## 🧪 Testing & Infrastructure
+
+- Testing/CI improvement ([#XXXX](https://github.com/redis/go-redis/pull/XXXX)) by [@username](https://github.com/username)
+- ...
+
+## 👥 Contributors
+
+We'd like to thank all the contributors who worked on this release!
+
+[@username1](https://github.com/username1), [@username2](https://github.com/username2), ...
+
+---
+
+**Full Changelog**: https://github.com/redis/go-redis/compare/vX.Y-1.Z...vX.Y.Z
+```
+
+## Guidelines
+
+### Highlights Section
+The Highlights section should contain the **most important** user-facing changes. Common categories include:
+
+- **Typed Errors** - Error handling improvements
+- **New Commands** - New Redis commands support (especially for new Redis versions)
+- **Search & Vector** - RediSearch and vector-related features
+- **Connection Pool** - Pool improvements and performance
+- **Metrics & Observability** - Monitoring and instrumentation
+- **Breaking Changes** - Any breaking changes (should be prominent)
+
+Each highlight should:
+- Have a descriptive title
+- Include context about why it matters
+- Link to relevant PRs
+- Include performance metrics if applicable
+
+### New Features Section
+- List all new features with PR links and contributor attribution
+- Use descriptive text, not just PR titles
+- Group related features together if it makes sense
+
+### Bug Fixes Section
+- Only include actual bug fixes
+- Be specific about what was broken and how it's fixed
+- Include issue links if the PR references an issue
+
+### Performance Section
+- Separate from New Features to highlight performance work
+- Include metrics when available (e.g., "47-67% faster", "33% less memory")
+- Explain the impact on users
+
+### Testing & Infrastructure Section
+- Include only important testing/CI changes
+- **Exclude** dependency bumps (e.g., dependabot PRs for actions)
+- **Exclude** minor CI tweaks unless they're significant
+- Include major Redis version updates in CI
+
+### What to Exclude
+- Dependency bumps (dependabot PRs)
+- Minor documentation typo fixes
+- Internal refactoring that doesn't affect users
+- Duplicate entries (same PR in multiple sections)
+- `dependabot[bot]` from contributors list
+
+### Formatting Rules
+1. **PR Links**: Use `([#XXXX](https://github.com/redis/go-redis/pull/XXXX))` format
+2. **Contributor Links**: Use `[@username](https://github.com/username)` format
+3. **Issue Links**: Use `([#XXXX](https://github.com/redis/go-redis/issues/XXXX))` format
+4. **Full Changelog**: Always include at the bottom with correct version comparison
+
+### Getting PR Information
+Use GitHub API to fetch PR details:
+```bash
+# Get recent merged PRs
+gh pr list --state merged --limit 50 --json number,title,author,mergedAt,url
+```
+
+Or use the GitHub web interface to review merged PRs between releases.
+
+### Example Workflow
+1. Gather all merged PRs since last release
+2. Categorize PRs by type (feature, bug fix, performance, etc.)
+3. Identify the 3-5 most important changes for Highlights
+4. Remove duplicates and dependency bumps
+5. Add PR and contributor links
+6. Review for clarity and completeness
+7. Add Full Changelog link with correct version tags
+
+## Example (v9.17.0)
+
+See the v9.17.0 release notes in `RELEASE-NOTES.md` for a complete example following this template.
+

.github/actions/run-tests/action.yml

@@ -18,22 +18,20 @@ runs:
     - name: Setup Test environment
       env:
         REDIS_VERSION: ${{ inputs.redis-version }}
-        CLIENT_LIBS_TEST_IMAGE: "redislabs/client-libs-test:${{ inputs.redis-version }}"
       run: |
         set -e
         redis_version_np=$(echo "$REDIS_VERSION" | grep -oP '^\d+.\d+')
-        
+
         # Mapping of redis version to redis testing containers
         declare -A redis_version_mapping=(
+          ["8.4.x"]="8.4.0"
           ["8.2.x"]="8.2.1-pre"
           ["8.0.x"]="8.0.2"
-          ["7.4.x"]="rs-7.4.0-v5"
-          ["7.2.x"]="rs-7.2.0-v17"
         )
-        
+
         if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then
           echo "REDIS_VERSION=${redis_version_np}" >> $GITHUB_ENV
-          echo "REDIS_IMAGE=redis:${{ inputs.redis-version }}" >> $GITHUB_ENV
+          echo "REDIS_IMAGE=redis:${REDIS_VERSION}" >> $GITHUB_ENV
           echo "CLIENT_LIBS_TEST_IMAGE=redislabs/client-libs-test:${redis_version_mapping[$REDIS_VERSION]}" >> $GITHUB_ENV
         else
           echo "Version not found in the mapping."
@@ -51,4 +49,4 @@ runs:
         RE_CLUSTER: "false"
       run: |
         make test.ci
-      shell: bash
+      shell: bash

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: Go
 
 on:
   push:
-    branches: [master, v9, v9.7, v9.8, 'ndyakov/*', 'ofekshenawa/*', 'htemelski-redis/*', 'ce/*']
+    branches: [master, v9, 'v9.*']
   pull_request:
     branches: [master, v9, v9.7, v9.8, 'ndyakov/*', 'ofekshenawa/*', 'htemelski-redis/*', 'ce/*']
 
@@ -18,9 +18,9 @@ jobs:
       fail-fast: false
       matrix:
         redis-version:
+          - "8.4.x" # Redis CE 8.4
           - "8.2.x" # Redis CE 8.2
           - "8.0.x" # Redis CE 8.0
-          - "7.4.x" # Redis stack 7.4
         go-version:
           - "1.23.x"
           - "1.24.x"
@@ -32,7 +32,7 @@ jobs:
           go-version: ${{ matrix.go-version }}
 
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Test environment
         env:
@@ -44,9 +44,9 @@ jobs:
           
           # Mapping of redis version to redis testing containers
           declare -A redis_version_mapping=(
+            ["8.4.x"]="8.4.0"
             ["8.2.x"]="8.2.1-pre"
             ["8.0.x"]="8.0.2"
-            ["7.4.x"]="rs-7.4.0-v5"
           )
           if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then
             echo "REDIS_VERSION=${redis_version_np}" >> $GITHUB_ENV
@@ -74,17 +74,16 @@ jobs:
         fail-fast: false
         matrix:
           redis-version:
+            - "8.4.x" # Redis CE 8.4
             - "8.2.x" # Redis CE 8.2
             - "8.0.x" # Redis CE 8.0
-            - "7.4.x" # Redis stack 7.4
-            - "7.2.x" # Redis stack 7.2
           go-version:
             - "1.23.x"
             - "1.24.x"
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Run tests
         uses: ./.github/actions/run-tests

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/doctests.yaml

@@ -16,7 +16,7 @@ jobs:
 
     services:
       redis-stack:
-        image: redislabs/client-libs-test:8.0.2
+        image: redislabs/client-libs-test:8.4.0
         env:
           TLS_ENABLED: no
           REDIS_CLUSTER: no
@@ -36,7 +36,7 @@ jobs:
           go-version: ${{ matrix.go-version }}
 
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Test doc examples
         working-directory: ./doctests

.github/workflows/golangci-lint.yml

@@ -20,9 +20,9 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v8.0.0
+        uses: golangci/golangci-lint-action@v9.1.0
         with:
           verify: true 
 

.github/workflows/spellcheck.yml

@@ -6,9 +6,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Check Spelling
-        uses: rojopolis/spellcheck-github-actions@0.52.0
+        uses: rojopolis/spellcheck-github-actions@0.55.0
         with:
           config_path: .github/spellcheck-settings.yml
           task_name: Markdown

.github/workflows/stale-issues.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       # First step: Handle regular issues (excluding needs-information)
       - name: Mark regular issues as stale
-        uses: actions/stale@v9
+        uses: actions/stale@v10
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -64,7 +64,7 @@ jobs:
 
       # Second step: Handle needs-information issues with accelerated timeline
       - name: Mark needs-information issues as stale
-        uses: actions/stale@v9
+        uses: actions/stale@v10
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/test-redis-enterprise.yml

@@ -20,10 +20,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Clone Redis EE docker repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: RedisLabs/redis-ee-docker
           path: redis-ee

Makefile

@@ -1,8 +1,8 @@
 GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort)
-REDIS_VERSION ?= 8.2
+REDIS_VERSION ?= 8.4
 RE_CLUSTER ?= false
 RCE_DOCKER ?= true
-CLIENT_LIBS_TEST_IMAGE ?= redislabs/client-libs-test:8.2.1-pre
+CLIENT_LIBS_TEST_IMAGE ?= redislabs/client-libs-test:8.4.0
 
 docker.start:
 	export RE_CLUSTER=$(RE_CLUSTER) && \