Skip to content

Commit 445ae9a

Browse files
authored
Merge pull request #75 from dmgav/fix-build
Fix for GH actions running unit tests
2 parents 2d0592b + 30e300a commit 445ae9a

File tree

5 files changed

+17
-5
lines changed

5 files changed

+17
-5
lines changed

.github/workflows/docker-configs/ldap-docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '2'
22

33
services:
44
openldap:
5-
image: docker.io/bitnami/openldap:2.6
5+
image: docker.io/bitnami/openldap:latest
66
ports:
77
- '1389:1389'
88
- '1636:1636'

.github/workflows/docs_publish.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ jobs:
2222
uses: actions/setup-python@v2
2323
with:
2424
python-version: ${{ matrix.python-version }}
25+
- uses: shogo82148/actions-setup-redis@v1
26+
with:
27+
redis-version: "7.x"
2528
- name: Install dependencies
2629
run: |
2730
sudo apt install redis

.github/workflows/testing.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
11+
python-version: ["3.10", "3.11", "3.12", "3.13"]
1212
# pydantic-version: ["<2.0.0", ">=2.0.0"]
1313
# exclude:
1414
# - python-version: "3.9"
@@ -29,9 +29,18 @@ jobs:
2929
uses: actions/setup-python@v2
3030
with:
3131
python-version: ${{ matrix.python-version }}
32+
- uses: shogo82148/actions-setup-redis@v1
33+
with:
34+
redis-version: "7.x"
3235
- name: Install dependencies
3336
run: |
34-
sudo apt install redis
37+
# sudo apt install redis
38+
39+
pushd ..
40+
git clone https://github.com/bitnami/containers.git
41+
cd containers/bitnami/openldap/2.6/debian-12
42+
docker build -t bitnami/openldap:latest .
43+
popd
3544
3645
# Start LDAP
3746
source start_LDAP.sh

docs/source/control_re_manager.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ The following WebSockets are currently implemented:
430430
For example, the console output stream may be received by connecting to the socket with
431431
``ws://localhost:60610/api/console_output/ws`` URI.
432432

433-
Currently ``/info/ws`` and ``/status/ws`` sockets are streaming the same sequence of RE Manager
433+
Currently ``/info/ws`` and ``/status/ws`` sockets are streaming the same sequence of RE Manager
434434
status messages. Additional messages may be added to the system info stream in the future.
435435

436436
Message format for console output messages::

start_LDAP.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
set -e
44

55
# Start LDAP server in docker container
6-
sudo docker pull bitnami/openldap:latest
6+
# sudo docker pull osixia/openldap:latest
77
sudo docker compose -f .github/workflows/docker-configs/ldap-docker-compose.yml up -d
88
sudo docker ps

0 commit comments

Comments
 (0)