Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/auto_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ jobs:
- name: Run tests
run: |
cd server
pipenv run pytest -v --cov=mergin mergin/tests
pipenv run pytest -v --cov=mergin --cov-report=lcov mergin/tests

# - name: Coveralls
# uses: coverallsapp/github-action@v2
# with:
# base-path: server
- name: Coveralls
uses: coverallsapp/github-action@v2
with:
base-path: server
format: lcov
9 changes: 9 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ services:
user: 901:999
volumes:
- ./projects:/data
- ./server/entrypoint.sh:/app/entrypoint.sh
env_file:
- .prod.env
depends_on:
Expand All @@ -38,8 +39,11 @@ services:
celery-beat:
image: lutraconsulting/merginmaps-backend:2024.2.2
container_name: celery-beat
restart: always
env_file:
- .prod.env
volumes:
- ./server/entrypoint.sh:/app/entrypoint.sh
depends_on:
- redis
- server-gunicorn
Expand All @@ -49,8 +53,13 @@ services:
celery-worker:
image: lutraconsulting/merginmaps-backend:2024.2.2
container_name: celery-worker
restart: always
user: 901:999
env_file:
- .prod.env
volumes:
- ./projects:/data
- ./server/entrypoint.sh:/app/entrypoint.sh
depends_on:
- redis
- server-gunicorn
Expand Down