Merge branch 'main' into node-exports-check-new

valkey-io · Jan 29, 2025 · f5545d2 · f5545d2
2 parents 0f07070 + 17a91b2
commit f5545d2
Show file tree

Hide file tree

Showing 48 changed files with 5,380 additions and 3,282 deletions.
diff --git a/.github/workflows/create-ephemeral-self-hosted-runner.yml b/.github/workflows/create-ephemeral-self-hosted-runner.yml
diff --git a/.github/workflows/ort.yml b/.github/workflows/ort.yml
@@ -74,11 +74,11 @@ jobs:
               with:
                   repository: "oss-review-toolkit/ort"
                   path: "./ort"
-                  ref: "26.0.0"
+                  ref: "44.0.0"
                   submodules: recursive
 
             - name: Install Rust toolchain
-              uses: dtolnay/rust-toolchain@1.78
+              uses: dtolnay/rust-toolchain@1.82
 
             - name: Build and install ORT
               if: steps.cache-ort.outputs.cache-hit != 'true'
@@ -100,10 +100,8 @@ jobs:
                   cat ~/.ort/config/config.yml
 
               ### NodeJS ###
-            - name: Set up Node.js 16.x
+            - name: Set up Node.js
               uses: actions/setup-node@v4
-              with:
-                  node-version: 16.x
 
             - name: Create package.json file for the Node wrapper
               uses: ./.github/workflows/node-create-package-file

diff --git a/.github/workflows/try-github-arm-runner.yml b/.github/workflows/try-github-arm-runner.yml
@@ -0,0 +1,10 @@
+name: Try GitHub ARM runners
+on:
+    workflow_dispatch:
+
+jobs:
+    hello-world:
+        runs-on: ubuntu-24.04-arm
+        steps:
+            - name: print Hello World
+              run: echo "Hello World from ARM"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@
 
 * Node: Fix `zrangeWithScores` (disallow `RangeByLex` as it is not supported) ([#2926](https://github.com/valkey-io/valkey-glide/pull/2926))
 * Core: improve fix in #2381 ([#2929](https://github.com/valkey-io/valkey-glide/pull/2929))
+* Java: Fix `lpopCount` null handling ([#3025](https://github.com/valkey-io/valkey-glide/pull/3025))
 
 #### Operational Enhancements
 

diff --git a/csharp/tests/Integration/GetAndSet.cs b/csharp/tests/Integration/GetAndSet.cs
@@ -2,8 +2,6 @@
 
 using System.Runtime.InteropServices;
 
-using FluentAssertions;
-
 using Glide;
 
 using static Tests.Integration.IntegrationTestBase;
@@ -13,12 +11,8 @@ public class GetAndSet : IClassFixture<IntegrationTestBase>
 {
     private async Task GetAndSetValues(AsyncClient client, string key, string value)
     {
-        _ = (await client.SetAsync(key, value))
-            .Should()
-            .Be("OK");
-        _ = (await client.GetAsync(key))
-            .Should()
-            .Be(value);
+        Assert.Equal("OK", await client.SetAsync(key, value));
+        Assert.Equal(value, await client.GetAsync(key));
     }
 
     private async Task GetAndSetRandomValues(AsyncClient client)
@@ -48,9 +42,7 @@ public async Task GetAndSetCanHandleNonASCIIUnicode()
     public async Task GetReturnsNull()
     {
         using AsyncClient client = new("localhost", TestConfiguration.STANDALONE_PORTS[0], false);
-        _ = (await client.GetAsync(Guid.NewGuid().ToString()))
-            .Should()
-            .BeNull();
+        Assert.Null(await client.GetAsync(Guid.NewGuid().ToString()));
     }
 
     [Fact]
@@ -111,9 +103,7 @@ public void ConcurrentOperationsWork()
                     }
                     else
                     {
-                        _ = (await client.GetAsync(Guid.NewGuid().ToString()))
-                            .Should()
-                            .BeNull();
+                        Assert.Null(await client.GetAsync(Guid.NewGuid().ToString()));
                     }
                 }
             }));

diff --git a/csharp/tests/tests.csproj b/csharp/tests/tests.csproj
@@ -28,7 +28,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
   </ItemGroup>
 
   <ItemGroup>