Merge pull request #1 from ruzniaievdm/ruzniaievdm/feat/gh-actions

feat: add github actions

.github/workflows/python-app.yml

@@ -4,33 +4,29 @@
 name: Python application
 
 on:
-  push:
-    branches: [ "main" ]
   pull_request:
-    branches: [ "main" ]
-
-permissions:
-  contents: read
+    branches: [main]
 
 jobs:
   build:
-
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.11
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.11"
-    - name: Install dependencies with poetry
-      run: |
-        python -m pip install --upgrade pip
-        pip install poetry==1.7.0
-        poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only test
-    - name: Lint with poetry
-      run: |
-        make app-lint
-    - name: Test with pytest
-      run: |
-        make app-test
+      - uses: actions/checkout@v3
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.11"
+      - name: Install dependencies with poetry
+        run: |
+          python -m pip install --upgrade pip
+          pip install poetry==1.7.0
+          poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only test
+      - name: Lint with Ruff
+        run: |
+          pip install ruff
+          ruff --output-format=github .
+        continue-on-error: true
+      - name: Test with pytest
+        run: |
+          app-test

Dockerfile

@@ -22,11 +22,10 @@ RUN poetry config virtualenvs.create false && poetry install --no-interaction --
 FROM app-builder as app-dev
 CMD python manage.py runserver 0.0.0.0:8000
 
+# App build test
 FROM app-builder as app-test
-
 RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only test
 
-
 # Web build
 FROM node:17-alpine AS web-builder
 

Makefile

@@ -13,8 +13,8 @@ up:
 
 load-fixtures:
 	docker compose run --rm app bash -c "./manage.py loaddata backend/fixtures/users.json \
-																														backend/fixtures/conversations.json \
-																														backend/fixtures/messages.json"
+															  backend/fixtures/conversations.json \
+															  backend/fixtures/messages.json"
 
 restart:
 	docker-compose restart
@@ -48,7 +48,7 @@ migrate:
 	docker compose run --rm app python manage.py migrate
 
 app-shell:
-	docker-compose exec -it app bash
+	docker-compose exec app bash
 
 web-shell:
 	docker compose run --rm web sh
@@ -66,13 +66,10 @@ db-console:
 	docker-compose exec -it db psql -U postgres postgres
 
 app-test:
-	docker-compose run --rm app-test bash -c "poetry run pytest"
-
-app-lint:
-	docker-compose run --rm app-test bash -c "poetry run pylint backend"
+	docker-compose run --rm app-test bash -c "poetry run pytest && poetry run pylint backend"
 
 web-test:
-	docker-compose run --rm web-test sh -c "npm run test"
+	docker-compose run --rm web-test sh -c "CI=true npm run lint && npm run test -- --coverage"
 
 test: \
 	web-test \

backend/pyproject.toml

@@ -19,6 +19,7 @@ channels = "^3.0.4"
 redis = "^5.0.1"
 # django-eventstream = "^4.5.1"
 black = "^24.2.0"
+pytz = "^2024.1"
 
 [tool.poetry.group.test]
 optional = true

docker-compose.yml

@@ -52,6 +52,27 @@ services:
     volumes:
       - pgdata:/var/lib/postgresql/data
 
+  app-test:
+    image: app-test
+    container_name: chat-app-test
+    build:
+      context: .
+      target: app-test
+    volumes:
+      - ./backend:/app/backend
+    depends_on:
+      - db
+
+  web-test:
+    image: web-test
+    container_name: chat-web-test
+    build:
+      context: .
+      target: web-dev
+    volumes:
+      - ./frontend:/app/frontend
+      - node_modules:/app/frontend/node_modules
+
 volumes:
   pgdata:
   redis_data: