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

valkey-io · Feb 6, 2025 · 6c59e89 · 6c59e89
2 parents e099a1d + 6a98816
commit 6c59e89
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
@@ -190,7 +190,9 @@ jobs:
                   apk update
                   apk add --no-cache git tar
 
-            - uses: actions/checkout@v4
+            - name: Checkout code
+              if: ${{ matrix.host.TARGET == 'x86_64-unknown-linux-musl' }}
+              uses: actions/checkout@v4
 
             - name: Setup musl on Linux
               if: ${{ matrix.host.TARGET == 'x86_64-unknown-linux-musl' }}

diff --git a/node/tests/SharedTests.ts b/node/tests/SharedTests.ts
@@ -8108,7 +8108,7 @@ export function runBaseTests(config: {
         const setWithUnixSec = await client.set(key, value, {
             expiry: {
                 type: TimeUnit.UnixSeconds,
-                count: Math.floor(Date.now() / 1000) + 1,
+                count: Math.floor(Date.now() / 1000) + 2,
             },
         });
         expect(setWithUnixSec).toEqual("OK");
@@ -8122,7 +8122,7 @@ export function runBaseTests(config: {
         const getResWithExpiryKeep = await client.get(key);
         expect(getResWithExpiryKeep).toEqual(value);
         // wait for the key to expire base on the previous set
-        let sleep = new Promise((resolve) => setTimeout(resolve, 1000));
+        let sleep = new Promise((resolve) => setTimeout(resolve, 2000));
         await sleep;
         const getResExpire = await client.get(key);
         // key should have expired