fix ci

dengliming · Mar 10, 2024 · 5154597 · 5154597
1 parent 1a06494
commit 5154597
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 53 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     services:
-      redismod:
+      redis-stack-server:
         image: redis/redis-stack-server:edge
         options: >-
           --health-cmd "redis-cli ping"
@@ -30,6 +30,24 @@ jobs:
           --health-retries 5
         ports:
           - 52568:6379
+      redisgears:
+        image: redislabs/redisgears:edge
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6383:6379
+      redisgraph:
+        image: redislabs/redisgraph:edge
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6384:6379
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 1.8
@@ -44,5 +62,5 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: Build with Maven
-        run: mvn clean install -DREDIS_HOST=localhost -DREDIS_PORT=52567 -DREDISAI_PORT=52568 -Dgpg.skip --file pom.xml
+        run: mvn clean install -DREDIS_HOST=localhost -DREDIS_PORT=52567 -DREDISAI_PORT=52568 -DREDIS_GEARS_PORT=6383 -DREDIS_GRAPH_PORT=6384 -Dgpg.skip --file pom.xml
       - uses: codecov/codecov-action@v1
diff --git a/commons/src/test/java/io/github/dengliming/redismodule/common/test/RedisConditions.java b/commons/src/test/java/io/github/dengliming/redismodule/common/test/RedisConditions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 dengliming.
+ * Copyright 2022-2024 dengliming.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,9 @@
 import org.redisson.client.codec.StringCodec;
 import org.redisson.client.protocol.RedisCommand;
 import org.redisson.client.protocol.decoder.ListMultiDecoder2;
+import org.redisson.client.protocol.decoder.MapKeyDecoder;
 import org.redisson.client.protocol.decoder.ObjectListReplayDecoder;
+import org.redisson.client.protocol.decoder.ObjectSetReplayDecoder;
 import org.redisson.client.protocol.decoder.StringListReplayDecoder;
 import org.redisson.command.CommandAsyncExecutor;
 
@@ -28,12 +30,11 @@
 
 public class RedisConditions {
 
-    private static final RedisCommand COMMAND = new RedisCommand<>("COMMAND",
-            new ListMultiDecoder2<>(new RedisConditionsDecoder(), new ObjectListReplayDecoder<>(),
-                    new StringListReplayDecoder()));
+    private static final RedisCommand COMMAND = new RedisCommand<>("COMMAND", "LIST",
+            new MapKeyDecoder(new ObjectSetReplayDecoder()));
 
     private static final RedisCommand MODULE_LIST = new RedisCommand<>("MODULE", "LIST",
-            new ListMultiDecoder2<>(new ModuleListDecoder(), new ObjectListReplayDecoder<>()));
+            new ListMultiDecoder2<>(new ModuleListDecoder(), new ObjectListReplayDecoder<>(), new StringListReplayDecoder()));
 
     private final Set<String> commands;
 

diff --git a/...ns/src/test/java/io/github/dengliming/redismodule/common/test/RedisConditionsDecoder.java b/...ns/src/test/java/io/github/dengliming/redismodule/common/test/RedisConditionsDecoder.java
diff --git a/redisearch/src/main/java/io/github/dengliming/redismodule/redisearch/RediSearch.java b/redisearch/src/main/java/io/github/dengliming/redismodule/redisearch/RediSearch.java
@@ -386,7 +386,7 @@ public Map<String, String> getConfig(ConfigOption option) {
     public RFuture<Map<String, String>> getConfigAsync(ConfigOption option) {
         RAssert.notNull(option, "ConfigOption must be not null");
 
-        return commandExecutor.readAsync(getName(), codec, FT_CONFIG_GET, option.getKeyword());
+        return commandExecutor.readAsync(getName(), StringCodec.INSTANCE, FT_CONFIG_GET, option.getKeyword());
     }
 
     public Map<String, String> getHelp(ConfigOption option) {

diff --git a/redisgears/src/test/java/io/github/dengliming/redismodule/redisgears/AbstractTest.java b/redisgears/src/test/java/io/github/dengliming/redismodule/redisgears/AbstractTest.java
@@ -32,7 +32,8 @@ public abstract class AbstractTest {
     @BeforeEach
     public void init() {
         Config config = new Config();
-        config.useSingleServer().setAddress("redis://" + TestSettings.host() + ":" + TestSettings.port());
+        config.useSingleServer().setAddress("redis://" + TestSettings.host() + ":" + System.getProperty("REDIS_GEARS_PORT",
+                TestSettings.port() + ""));
         redisGearsClient = new RedisGearsClient(config);
         redisGearsClient.flushall();
     }

diff --git a/redisgraph/src/test/java/io/github/dengliming/redismodule/redisgraph/AbstractTest.java b/redisgraph/src/test/java/io/github/dengliming/redismodule/redisgraph/AbstractTest.java
@@ -32,7 +32,8 @@ public abstract class AbstractTest {
     @BeforeEach
     public void init() {
         Config config = new Config();
-        config.useSingleServer().setAddress("redis://" + TestSettings.host() + ":" + TestSettings.port());
+        config.useSingleServer().setAddress("redis://" + TestSettings.host() + ":" + System.getProperty("REDIS_GRAPH_PORT",
+                TestSettings.port() + ""));
         redisGraphClient = new RedisGraphClient(config);
         redisGraphClient.flushall();
     }