upd

.github/workflows/coverage.yaml

@@ -23,16 +23,13 @@ jobs:
 
       - run: make creport SHA=${{ github.sha }}
 
-      - run: ls
-
-
-      #- run: pip install smokeshow
-
-      #- run: smokeshow upload htmlcov
-      #  env:
-      #    SMOKESHOW_GITHUB_STATUS_DESCRIPTION: Coverage {coverage-percentage}
-      #    SMOKESHOW_GITHUB_COVERAGE_THRESHOLD: 80
-      #    SMOKESHOW_GITHUB_TOKEN: ${{ secrets.FASTAPI_SMOKESHOW_UPLOAD }}
-      #    SMOKESHOW_GITHUB_PR_HEAD_SHA: ${{ github.event.workflow_run.head_sha }}
-      #    SMOKESHOW_AUTH_KEY: ${{ secrets.SMOKESHOW_AUTH_KEY }}
+      - run: pip install smokeshow
+
+      - run: smokeshow upload htmlcov
+        env:
+          SMOKESHOW_GITHUB_STATUS_DESCRIPTION: Coverage {coverage-percentage}
+          SMOKESHOW_GITHUB_COVERAGE_THRESHOLD: 80
+          SMOKESHOW_GITHUB_TOKEN: ${{ secrets.FASTAPI_SMOKESHOW_UPLOAD }}
+          SMOKESHOW_GITHUB_PR_HEAD_SHA: ${{ github.event.workflow_run.head_sha }}
+          SMOKESHOW_AUTH_KEY: ${{ secrets.SMOKESHOW_AUTH_KEY }}
 

Makefile

@@ -3,14 +3,15 @@ HOST = localhost
 
 TEST_COMMAND = pytest -s -vv
 COVERAGE_COMMAND = coverage run --branch --concurrency=thread,gevent -m pytest  
-COV_REPORT_COVERAGE_COMMAND = coverage html 
+REPORT_COVERAGE_COMMAND = coverage html 
 EXPORT_COMMAND = python src/export_spec.py
 
 RUFF_COMMAND = ruff
 ISORT_COMMAND = isort
 MYPY_COMMAND = mypy
 
 DOCKER_EXEC = docker-compose run --rm app
+COVERAGE_DOCKER_EXEC = docker-compose run --rm -u root app
 
 # ###############
 # Local
@@ -59,13 +60,13 @@ dtest:
 
 .PHONY: ctest
 ctest:
-	docker-compose run --rm -u root app \
+	${COVERAGE_DOCKER_EXEC} \
 		${COVERAGE_COMMAND}
 
 .PHONY: creport
 creport:
-	docker-compose run --rm -u root app \
-		${COV_REPORT_COVERAGE_COMMAND} --show-contexts --title "Coverage for ${SHA}"
+	${COVERAGE_DOCKER_EXEC} \
+		${REPORT_COVERAGE_COMMAND} --show-contexts --title "Coverage for ${SHA}"
 
 
 .PHONY: dcheck