Support Valkey image:latest and Redis:latest for test (#258)

* set valkey:latest

Signed-off-by: zunda <zunda.dev@gmail.com>

* add redis (#2)

Signed-off-by: yazawa hiroki <zunda.dev@gmail.com>
Signed-off-by: zunda <zunda.dev@gmail.com>

* change to redis

Signed-off-by: zunda <zunda.dev@gmail.com>

* add isValkey

remove space

Signed-off-by: zunda <zunda.dev@gmail.com>

* add getHello to identify server

Signed-off-by: zunda <zunda.dev@gmail.com>

* format

Signed-off-by: zunda <zunda.dev@gmail.com>

---------

Signed-off-by: zunda <zunda.dev@gmail.com>
Signed-off-by: yazawa hiroki <zunda.dev@gmail.com>

Author: zunda-pixel

.github/workflows/ci.yml

@@ -10,22 +10,21 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  VALKEY_HOSTNAME: valkey
+  VALKEY_HOSTNAME: database
+  REDIS_HOSTNAME: database
 jobs:
   unit-tests:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     strategy:
       matrix:
-        image: ["swift:6.1", "swift:6.2"]
+        swift: ["swift:6.1", "swift:6.2"]
+        database: ["valkey/valkey:latest", "redis:latest"]
     container:
-      image: ${{ matrix.image }}
+      image: ${{ matrix.swift }}
     services:
-      valkey:
-        image: valkey/valkey:8.0
-        ports:
-          - 6379:6379
-        options: --entrypoint valkey-server
+      database:
+        image: ${{ matrix.database }}
     steps:
       - name: Install jemalloc
         run: |

Tests/IntegrationTests/CommandIntegrationTests.swift

@@ -175,8 +175,8 @@ struct CommandIntegratedTests {
                         return redis.call("SET", keys[1], args[1])
                     end
 
-                    server.register_function('valkey_swift_test_set', test_set)
-                    server.register_function('valkey_swift_test_get', test_get)
+                    redis.register_function('valkey_swift_test_set', test_set)
+                    redis.register_function('valkey_swift_test_get', test_get)
                     """
             )
             let list = try await client.functionList(libraryNamePattern: "_valkey_swift_tests", withcode: true)
@@ -198,6 +198,16 @@ struct CommandIntegratedTests {
         var logger = Logger(label: "Valkey")
         logger.logLevel = .trace
         try await withValkeyClient(.hostname(valkeyHostname, port: 6379), logger: logger) { client in
+            let helloResponse = try await client.hello()
+            let serverNameValue = try #require(helloResponse.first { $0.key.value == .bulkString(ByteBuffer(string: "server")) }?.value.value)
+            let serverName: String? =
+                if case .bulkString(let nameBuffer) = serverNameValue {
+                    String(buffer: nameBuffer)
+                } else {
+                    nil
+                }
+            guard serverName == "valkey" else { return }
+
             let sha1 = try await client.scriptLoad(
                 script: "return redis.call(\"GET\", KEYS[1])"
             )