fix ci (#43)

* fix server ci * update server requirements
superdesk · Aug 5, 2024 · 45ac47a · 45ac47a
1 parent cfc98cd
commit 45ac47a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 30 deletions.
diff --git a/.actions-docker-compose.yml b/.actions-docker-compose.yml
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,6 +8,24 @@ jobs:
   server:
     runs-on: ubuntu-latest
 
+    services:
+      redis:
+          image: redis:alpine
+          ports:
+              - "6379:6379"
+
+      mongo:
+          image: mongo:3.6
+          ports:
+              - "27017:27017"
+
+      elastic:
+          image: docker.elastic.co/elasticsearch/elasticsearch:7.17.23
+          ports:
+              - "9200:9200"
+          env:
+              discovery.type: single-node
+
     defaults:
       run:
         working-directory: server
@@ -20,9 +38,6 @@ jobs:
         with:
           python-version: 3.8
 
-      - name: docker-compose
-        run: docker-compose -f ../.actions-docker-compose.yml up -d
-
       - run: sudo apt-get update && sudo apt-get -y install libxml2-dev libxmlsec1-dev libxmlsec1-openssl
 
       - name: cache pip

diff --git a/server/requirements.txt b/server/requirements.txt
@@ -222,7 +222,7 @@ markupsafe==2.0.1
     #   newsroom-core
     #   superdesk-core
     #   wtforms
-mongolock==1.3.4
+mongolock @ git+https://github.com/superdesk/mongolock.git@v1
     # via superdesk-core
 natsort==8.4.0
     # via croniter
@@ -362,9 +362,9 @@ six==1.16.0
     #   oauth2client
     #   python-bidi
     #   python-dateutil
-superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@v2.7.0-rc4
+superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@v2.7.3
     # via newsroom-core
-superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@v2.7.0-rc1
+superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@v2.7.2
     # via newsroom-core
 svglib==1.5.1
     # via xhtml2pdf
@@ -387,7 +387,7 @@ unidecode==0.4.21
     # via superdesk-core
 uritools==4.0.2
     # via pyhanko-certvalidator
-urllib3==1.25.11
+urllib3==1.26.19
     # via
     #   botocore
     #   elastic-apm
@@ -428,6 +428,7 @@ xmlsec==1.3.13
     # via
     #   newsroom-core
     #   python3-saml
+    #   superdesk-core
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools