From 9a29a85a944b3ddf52f4b9458edfc696cff1d5a6 Mon Sep 17 00:00:00 2001
From: Nicolas Favre-Felix <n.favrefelix@gmail.com>
Date: Fri, 25 Aug 2023 09:09:28 -0700
Subject: [PATCH] GHA: upgrade Ubuntu, include Websocket tests

* Switch from Ubuntu 18.04 to 20.04
* Install WS dependency with pip
* Run WS tests as part of the "build" GHA
---
 .github/workflows/build.yml      | 10 +++++++---
 .github/workflows/webdis-ci.json |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0aa1e17..ce004ff 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,18 +6,20 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   build-and-run-tests:
     runs-on: ubuntu-20.04     # this is a GitHub Runner, hosting the execution
-    container: ubuntu:18.04   # but this is a Docker Hub container, in which everything runs
+    container: ubuntu:20.04   # but this is a Docker Hub container, in which everything runs
 
     services:
       redis:
-        image: redis:6.2.1-alpine  # Docker Hub image used as a sidecar
+        image: redis:7.0.12-alpine  # Docker Hub image used as a sidecar
 
     steps:
     - uses: actions/checkout@v2
     - name: Install dependencies
       run: |
         apt-get -y update
-        apt-get -y --force-yes install make gcc libevent-dev libmsgpack-dev python3 curl
+        apt-get -y --allow-unauthenticated --allow-downgrades --allow-remove-essential --allow-change-held-packages \
+          install make gcc libevent-dev libmsgpack-dev python3.8 python3-pip curl
+        update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 1
     - name: Build
       run: make
     - name: Run Webdis and test
@@ -26,6 +28,8 @@ jobs:
         sleep 2
         ./tests/basic.py
         ./tests/curl-tests.sh
+        pip3 --no-cache-dir install -r tests/requirements.txt
+        ./tests/ws-tests.py
     - name: Archive logs
       uses: actions/upload-artifact@v2
       with:
diff --git a/.github/workflows/webdis-ci.json b/.github/workflows/webdis-ci.json
index 3174b7d..2d30d75 100644
--- a/.github/workflows/webdis-ci.json
+++ b/.github/workflows/webdis-ci.json
@@ -9,7 +9,7 @@
   "pool_size": 20,
 
   "daemonize": true,
-  "websockets": false,
+  "websockets": true,
 
   "database": 0,
   "acl": [