From e364e29d27f6d32d7dedda65f25a69ea20536f0c Mon Sep 17 00:00:00 2001 From: Tomer_Mamia Date: Thu, 25 Jul 2024 13:25:04 +0300 Subject: [PATCH] fix messages 2 --- .github/workflows/push-dev.yml | 14 ++++++++------ Makefile | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/push-dev.yml b/.github/workflows/push-dev.yml index 03573530..a1976069 100644 --- a/.github/workflows/push-dev.yml +++ b/.github/workflows/push-dev.yml @@ -20,7 +20,7 @@ jobs: run: make dev-env - name: Run unit tests run: make test-coverage - # in order to get unique identifier we use github.run_id with artifact name. + # In order to get unique identifier we use github.run_id with artifact name. - name: Upload coverage report uses: actions/upload-artifact@v4 with: @@ -44,7 +44,7 @@ jobs: V3IO_ACCESS_KEY: ${{ secrets.V3IO_ACCESS_KEY }} V3IO_FRAMESD: ${{ secrets.V3IO_FRAMESD }} run: make integration-coverage - # in order to get unique identifier we use github.run_id with artifact name. + # In order to get unique identifier we use github.run_id with artifact name. - name: Upload coverage report uses: actions/upload-artifact@v4 with: @@ -65,21 +65,23 @@ jobs: cache: pip - name: Install dependencies run: make dev-env - # File name is not effected by the artifact name (=identifier only). + # File name is not effected by the artifact name (=identifier only) - name: Download unit tests coverage report uses: actions/download-artifact@v4 with: name: coverage_unit_tests_report-${{ github.run_id }} - path: coverage_reports/ # where to download. file downloaded by name. + # Where to download. file downloaded by name. + path: coverage_reports/ - name: Download integration coverage report uses: actions/download-artifact@v4 with: name: coverage_integration_report-${{ github.run_id }} - path: coverage_reports/ # where to download. file downloaded by name. + # Where to download. file downloaded by name. + path: coverage_reports/ - name: Combine coverage run: make coverage-combine - # in order to be able to download it from the github run: + # In order to be able to download it from the github run: - name: Upload coverage combined report uses: actions/upload-artifact@v4 with: diff --git a/Makefile b/Makefile index 7aaa0639..970b922f 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ integration-coverage: clean-test find integration -name '*.pyc' -exec rm {} \; rm -f coverage_reports/integration.coverage COVERAGE_FILE=coverage_reports/integration.coverage coverage run --rcfile=tests.coveragerc -m pytest -rf -v integration - @echo "Coverage integration report:" + @echo "Integration test coverage report:" COVERAGE_FILE=coverage_reports/integration.coverage coverage report --rcfile=tests.coveragerc .PHONY: env @@ -115,7 +115,7 @@ docs: # Build html docs coverage-combine: rm -f coverage_reports/combined.coverage COVERAGE_FILE=coverage_reports/combined.coverage coverage combine --keep coverage_reports/integration.coverage coverage_reports/unit_tests.coverage - @echo "Coverage full report:" + @echo "Full coverage report:" COVERAGE_FILE=coverage_reports/combined.coverage coverage report --rcfile=tests.coveragerc -i .PHONY: coverage