Merge branch 'develop' into sign-off-authors-filed-fix

superdesk · Aug 14, 2024 · fd7d7a3 · fd7d7a3
2 parents f95bd51 + aaecc53
commit fd7d7a3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 26 deletions.
diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,6 +9,23 @@ jobs:
   server:
 
     runs-on: ubuntu-latest
+    services:
+      redis:
+          image: redis:alpine
+          ports:
+              - "6379:6379"
+
+      mongo:
+          image: mongo:4.4
+          ports:
+              - "27017:27017"
+
+      elastic:
+          image: elasticsearch:7.10.1
+          ports:
+              - "9200:9200"
+          env:
+              discovery.type: single-node
 
     defaults:
       run:
@@ -27,8 +44,6 @@ jobs:
         sudo apt-get update
         sudo apt-get -y install libxml2-dev libxmlsec1-dev libxmlsec1-openssl libexempi-dev
 
-    - run: docker-compose -f ../.github/docker-compose.yml up -d
-
     - run: |
         python -m pip install --upgrade pip wheel setuptools
         pip install -r dev-requirements.txt

diff --git a/server/requirements.txt b/server/requirements.txt
@@ -164,7 +164,7 @@ markupsafe==2.0.1
     #   jinja2
     #   superdesk-core
     #   wtforms
-mongolock==1.3.4
+mongolock @ git+https://github.com/superdesk/mongolock.git@v1
     # via superdesk-core
 oauth2client==4.1.3
     # via flask-oidc-ex
@@ -274,7 +274,7 @@ tzlocal==2.1
     # via superdesk-core
 unidecode==1.3.8
     # via superdesk-core
-urllib3==1.25.11
+urllib3==1.26.19
     # via
     #   botocore
     #   elastic-apm