Skip to content

Commit

Permalink
GHA: upgrade Ubuntu, include Websocket tests
Browse files Browse the repository at this point in the history
* Switch from Ubuntu 18.04 to 20.04
* Install WS dependency with pip
* Run WS tests as part of the "build" GHA
  • Loading branch information
nicolasff committed Aug 25, 2023
1 parent b59d866 commit 9a29a85
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/webdis-ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"pool_size": 20,

"daemonize": true,
"websockets": false,
"websockets": true,

"database": 0,
"acl": [
Expand Down

0 comments on commit 9a29a85

Please sign in to comment.