diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index de154b0d891..dbae265451b 100644 --- a/.github/workflows/coverage.yaml +++ b/.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 }} \ No newline at end of file diff --git a/Makefile b/Makefile index e336fa4a582..51cf9c47528 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ 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 @@ -11,6 +11,7 @@ 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