From 5b403d7fb9e7fb159b59405cf4c639bb287bd8a2 Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Thu, 3 Jul 2025 15:37:05 +0200 Subject: [PATCH 1/7] Update test matrix for Redis versions --- .github/actions/run-tests/action.yml | 4 ++-- .github/workflows/integration.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml index 2fa1dd30..da0bc602 100644 --- a/.github/actions/run-tests/action.yml +++ b/.github/actions/run-tests/action.yml @@ -51,8 +51,8 @@ runs: # Mapping of redis version to stack version declare -A redis_stack_version_mapping=( - ["7.4.1"]="rs-7.4.0-v1" - ["7.2.6"]="rs-7.2.0-v13" + ["7.4.1"]="rs-7.4.0-v5" + ["7.2.6"]="rs-7.2.0-v17" ["6.2.16"]="rs-6.2.6-v17" ) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 437be795..a119dccd 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -17,7 +17,7 @@ concurrency: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - CURRENT_REDIS_VERSION: '7.4.1' + CURRENT_REDIS_VERSION: '8.0.2' jobs: redis_version: @@ -37,7 +37,7 @@ jobs: max-parallel: 15 fail-fast: false matrix: - redis-version: [ '8.0-RC2-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.2.6', '6.2.16'] + redis-version: [ '8.2-RC1-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.4.4', '7.2.6', '6.2.16'] dotnet-version: ['6.0', '7.0', '8.0'] env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true @@ -59,7 +59,7 @@ jobs: strategy: fail-fast: false matrix: - redis-stack-version: ['6.2.6-v18', '7.2.0-v14', '7.4.0-v2'] + redis-stack-version: ['6.2.6-v18', '7.2.0-v17', '7.4.0-v5'] env: redis_stack_version: ${{matrix.redis-stack-version}} USER_NAME: ${{ secrets.USER_NAME }} From 93e03b54f6be1a6ecfb25374dd28a62d6436e11c Mon Sep 17 00:00:00 2001 From: atakavci Date: Tue, 5 Aug 2025 10:12:26 +0300 Subject: [PATCH 2/7] - update to rs-7.4.0-v6 --- .github/actions/run-tests/action.yml | 2 +- .github/workflows/integration.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml index da0bc602..27e1dfab 100644 --- a/.github/actions/run-tests/action.yml +++ b/.github/actions/run-tests/action.yml @@ -51,7 +51,7 @@ runs: # Mapping of redis version to stack version declare -A redis_stack_version_mapping=( - ["7.4.1"]="rs-7.4.0-v5" + ["7.4.1"]="rs-7.4.0-v6" ["7.2.6"]="rs-7.2.0-v17" ["6.2.16"]="rs-6.2.6-v17" ) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index a119dccd..8d3d42e8 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -37,7 +37,7 @@ jobs: max-parallel: 15 fail-fast: false matrix: - redis-version: [ '8.2-RC1-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.4.4', '7.2.6', '6.2.16'] + redis-version: [ '8.2-RC1-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.4.1', '7.2.6', '6.2.16'] dotnet-version: ['6.0', '7.0', '8.0'] env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true From 303999a305976c24c13c77560d8bb441d904c3da Mon Sep 17 00:00:00 2001 From: atakavci Date: Tue, 5 Aug 2025 10:20:09 +0300 Subject: [PATCH 3/7] - rs-7.4.0-v5 --- .github/actions/run-tests/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml index 27e1dfab..da0bc602 100644 --- a/.github/actions/run-tests/action.yml +++ b/.github/actions/run-tests/action.yml @@ -51,7 +51,7 @@ runs: # Mapping of redis version to stack version declare -A redis_stack_version_mapping=( - ["7.4.1"]="rs-7.4.0-v6" + ["7.4.1"]="rs-7.4.0-v5" ["7.2.6"]="rs-7.2.0-v17" ["6.2.16"]="rs-6.2.6-v17" ) From e00267e9195ef3bc9a69389c9fbfe42598408b48 Mon Sep 17 00:00:00 2001 From: atakavci Date: Tue, 5 Aug 2025 10:26:24 +0300 Subject: [PATCH 4/7] - 7.4.0-v6 --- .github/workflows/integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 8d3d42e8..280b2365 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -59,7 +59,7 @@ jobs: strategy: fail-fast: false matrix: - redis-stack-version: ['6.2.6-v18', '7.2.0-v17', '7.4.0-v5'] + redis-stack-version: ['6.2.6-v18', '7.2.0-v17', '7.4.0-v6'] env: redis_stack_version: ${{matrix.redis-stack-version}} USER_NAME: ${{ secrets.USER_NAME }} From 9eab232d951d973d04220c7a5f6cb04c2f9e1524 Mon Sep 17 00:00:00 2001 From: atakavci Date: Tue, 5 Aug 2025 10:40:02 +0300 Subject: [PATCH 5/7] - 8.2-rc2-pre --- .github/workflows/integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 280b2365..b88904bc 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -37,7 +37,7 @@ jobs: max-parallel: 15 fail-fast: false matrix: - redis-version: [ '8.2-RC1-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.4.1', '7.2.6', '6.2.16'] + redis-version: [ '8.2-rc2-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.4.1', '7.2.6', '6.2.16'] dotnet-version: ['6.0', '7.0', '8.0'] env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true From b93f9528739d83ccce6adbed5bfb489bea4291e9 Mon Sep 17 00:00:00 2001 From: atakavci Date: Mon, 23 Jun 2025 17:08:50 +0300 Subject: [PATCH 6/7] fix client info response assertions --- .../Core Commands/CoreTests.cs | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/NRedisStack.Tests/Core Commands/CoreTests.cs b/tests/NRedisStack.Tests/Core Commands/CoreTests.cs index 61b8ec41..3f7e6189 100644 --- a/tests/NRedisStack.Tests/Core Commands/CoreTests.cs +++ b/tests/NRedisStack.Tests/Core Commands/CoreTests.cs @@ -108,9 +108,14 @@ public void TestSetInfoNull(string endpointId) int infoAfterLibNameIndex = infoAfter!.IndexOf("lib-name="); int infoBeforeLibNameIndex = infoBefore!.IndexOf("lib-name="); + int infoAfterLibVerIndex = infoAfter.IndexOf(" ", infoAfter!.IndexOf("lib-ver=")); + infoAfterLibVerIndex = infoAfterLibVerIndex == -1 ? infoAfter.Length : infoAfterLibVerIndex; + int infoBeforeLibVerIndex = infoBefore!.IndexOf(" ", infoBefore!.IndexOf("lib-ver=")); + infoBeforeLibVerIndex = infoBeforeLibVerIndex == -1 ? infoBefore.Length : infoBeforeLibVerIndex; + // Extract the sub-strings starting from "lib-name=" - string infoAfterLibNameToEnd = infoAfter.Substring(infoAfterLibNameIndex); - string infoBeforeLibNameToEnd = infoBefore.Substring(infoBeforeLibNameIndex); + string infoAfterLibNameToEnd = infoAfter.Substring(infoAfterLibNameIndex, infoAfterLibVerIndex - infoAfterLibNameIndex); + string infoBeforeLibNameToEnd = infoBefore.Substring(infoBeforeLibNameIndex, infoBeforeLibVerIndex - infoBeforeLibNameIndex); // Assert that the extracted sub-strings are equal Assert.Equal(infoAfterLibNameToEnd, infoBeforeLibNameToEnd); @@ -131,9 +136,14 @@ public async Task TestSetInfoNullAsync(string endpointId) int infoAfterLibNameIndex = infoAfter!.IndexOf("lib-name="); int infoBeforeLibNameIndex = infoBefore!.IndexOf("lib-name="); + int infoAfterLibVerIndex = infoAfter.IndexOf(" ", infoAfter!.IndexOf("lib-ver=")); + infoAfterLibVerIndex = infoAfterLibVerIndex == -1 ? infoAfter.Length : infoAfterLibVerIndex; + int infoBeforeLibVerIndex = infoBefore.IndexOf(" ", infoBefore!.IndexOf("lib-ver=")); + infoBeforeLibVerIndex = infoBeforeLibVerIndex == -1 ? infoBefore.Length : infoBeforeLibVerIndex; + // Extract the sub-strings starting from "lib-name=" - string infoAfterLibNameToEnd = infoAfter.Substring(infoAfterLibNameIndex); - string infoBeforeLibNameToEnd = infoBefore.Substring(infoBeforeLibNameIndex); + string infoAfterLibNameToEnd = infoAfter.Substring(infoAfterLibNameIndex, infoAfterLibVerIndex - infoAfterLibNameIndex); + string infoBeforeLibNameToEnd = infoBefore.Substring(infoBeforeLibNameIndex, infoBeforeLibVerIndex - infoBeforeLibNameIndex); // Assert that the extracted sub-strings are equal Assert.Equal(infoAfterLibNameToEnd, infoBeforeLibNameToEnd); From 3c64d35dbe4c4baa96ee60e303ff6008a3995067 Mon Sep 17 00:00:00 2001 From: atakavci Date: Tue, 5 Aug 2025 12:03:51 +0300 Subject: [PATCH 7/7] - format --- tests/NRedisStack.Tests/Core Commands/CoreTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/NRedisStack.Tests/Core Commands/CoreTests.cs b/tests/NRedisStack.Tests/Core Commands/CoreTests.cs index 3f7e6189..f400e15b 100644 --- a/tests/NRedisStack.Tests/Core Commands/CoreTests.cs +++ b/tests/NRedisStack.Tests/Core Commands/CoreTests.cs @@ -109,7 +109,7 @@ public void TestSetInfoNull(string endpointId) int infoBeforeLibNameIndex = infoBefore!.IndexOf("lib-name="); int infoAfterLibVerIndex = infoAfter.IndexOf(" ", infoAfter!.IndexOf("lib-ver=")); - infoAfterLibVerIndex = infoAfterLibVerIndex == -1 ? infoAfter.Length : infoAfterLibVerIndex; + infoAfterLibVerIndex = infoAfterLibVerIndex == -1 ? infoAfter.Length : infoAfterLibVerIndex; int infoBeforeLibVerIndex = infoBefore!.IndexOf(" ", infoBefore!.IndexOf("lib-ver=")); infoBeforeLibVerIndex = infoBeforeLibVerIndex == -1 ? infoBefore.Length : infoBeforeLibVerIndex;