From 1fc5cf0870ede88a5392ff1541daa339f499603f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kol=C3=A1rik?= <martin@kolarik.sk>
Date: Mon, 6 Jan 2025 20:46:38 +0100
Subject: [PATCH] ci: use the cluster in tests

---
 .github/workflows/ci.yml  | 13 +++----------
 .github/workflows/e2e.yml | 13 +++----------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 37a68655..17d96cd7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,16 +15,6 @@ jobs:
       NODE_ENV: test
 
     services:
-      redis:
-        image: redis/redis-stack-server:latest
-        ports:
-          - 16379:6379
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-
       mariadb:
         image: mariadb:10.11.5
         ports:
@@ -45,6 +35,9 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 20.x
+      - name: Set up Redis
+        run: |
+          docker compose --env-file config/redis/docker.env up
       - name: Build
         run: |
           npm ci
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index bc3f4cb4..c5a2fb7b 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -15,16 +15,6 @@ jobs:
       NODE_ENV: test
 
     services:
-      redis:
-        image: redis/redis-stack-server:latest
-        ports:
-          - 16379:6379
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-
       mariadb:
         image: mariadb:10.11.5
         ports:
@@ -51,6 +41,9 @@ jobs:
           sudo mv daemon.json /etc/docker/
           sudo systemctl restart docker
           docker restart $(docker ps -aq)
+      - name: Set up Redis
+        run: |
+          docker compose --env-file config/redis/docker.env up
       - name: Build
         run: |
           npm ci