Merge remote-tracking branch 'origin/develop' into templates-e2e-test

dzonidoo · Apr 8, 2024 · 4afc77d · 4afc77d
2 parents 0a05402 + 1be64a7
commit 4afc77d
Show file tree

Hide file tree

Showing 4 changed files with 345 additions and 269 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -42,9 +42,9 @@ jobs:
 
     - name: Start e2e server
       run: |
-        docker-compose pull
-        docker-compose build
-        docker-compose up -d
+        docker compose pull
+        docker compose build
+        docker compose up -d
       working-directory: e2e/server
 
     - name: Build client
@@ -90,5 +90,5 @@ jobs:
 
     - name: Server Logs
       if: ${{ failure() }}
-      run: docker-compose logs superdesk
+      run: docker compose logs superdesk
       working-directory: e2e/server
diff --git a/.travis.yml b/.travis.yml