Merge branch 'main' into valkey-cli-as-option

.github/json_matrices/build-matrix.json

@@ -12,7 +12,7 @@
     {
         "OS": "ubuntu",
         "NAMED_OS": "linux",
-        "RUNNER": ["self-hosted", "Linux", "ARM64"],
+        "RUNNER": ["self-hosted", "Linux", "ARM64", "ephemeral"],
         "ARCH": "arm64",
         "TARGET": "aarch64-unknown-linux-gnu",
         "PACKAGE_MANAGERS": ["pypi", "npm", "maven"],

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

@@ -35,31 +35,9 @@ runs:
                   ~/valkey
               key: valkey-${{ inputs.engine-version }}-${{ inputs.target }}
 
-        - name: Build Valkey for ARM
-          if: ${{ contains(inputs.target, 'aarch64-unknown') }}
-          shell: bash
-          working-directory: ~
-          run: |
-              cd ~
-              echo "Building valkey ${{ inputs.engine-version }}"
-              # check if the valkey repo is already cloned
-              if [[ ! -d valkey ]]; then
-                  git clone https://github.com/valkey-io/valkey.git
-              else
-                  # check if the branch=version is already checked out
-                  if [[ $(git branch --show-current) != ${{ inputs.engine-version }} ]]; then
-                      cd valkey
-                      make clean
-                      make distclean
-                      sudo rm -rf /usr/local/bin/redis-* /usr/local/bin/valkey-* ./valkey-* ./redis-* ./dump.rdb
-                      git fetch --all
-                      git checkout ${{ inputs.engine-version }}
-                      git pull
-                  fi
-              fi
         # if no cache hit, build the engine
         - name: Build Valkey
-          if: ${{ steps.cache-valkey.outputs.cache-hit != 'true' && !contains(inputs.target, 'aarch64-unknown') }}
+          if: ${{ steps.cache-valkey.outputs.cache-hit != 'true' }}
           shell: bash
           run: |
               echo "Building valkey ${{ inputs.engine-version }}"

.github/workflows/scale-shr-test.yml

@@ -4,7 +4,7 @@ on:
 
 jobs:
     hello-world:
-        runs-on: [self-hosted, linux, ARM64]
+        runs-on: [self-hosted, Linux, ARM64, ephemeral]
         steps:
             - name: print Hello World
               run: echo "Hello World"

.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"

CHANGELOG.md

@@ -20,13 +20,15 @@
 * Java: Shadow `protobuf` dependency ([#2931](https://github.com/valkey-io/valkey-glide/pull/2931))
 * Java: Add `RESP2` support ([#2383](https://github.com/valkey-io/valkey-glide/pull/2383))
 * Node, Python: Add `IFEQ` option ([#2909](https://github.com/valkey-io/valkey-glide/pull/2909), [#2962](https://github.com/valkey-io/valkey-glide/pull/2962))
+* Java: Add `IFEQ` option ([#2978](https://github.com/valkey-io/valkey-glide/pull/2978))
 
 #### Breaking Changes
 
 #### Fixes
 
 * 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
 

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()));
                     }
                 }
             }));

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>