diff --git a/.github/workflows/CompletePipeline.yml b/.github/workflows/CompletePipeline.yml index a954a19..ba135c0 100644 --- a/.github/workflows/CompletePipeline.yml +++ b/.github/workflows/CompletePipeline.yml @@ -141,10 +141,11 @@ jobs: jobs: ${{ needs.UnitTestingParams.outputs.python_jobs }} requirements: "-r tests/unit/requirements.txt" # pacboy: "msys/git python-lxml:p" - unittest_report_xml_directory: ${{ needs.ConfigParams.outputs.unittest_report_xml_directory }} - unittest_report_xml_filename: ${{ needs.ConfigParams.outputs.unittest_report_xml_filename }} - unittest_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }} - coverage_sqlite_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_sqlite }} + unittest_report_xml_directory: ${{ needs.ConfigParams.outputs.unittest_report_xml_directory }} + unittest_report_xml_filename: ${{ needs.ConfigParams.outputs.unittest_report_xml_filename }} + coverage_report_html_directory: ${{ needs.ConfigParams.outputs.coverage_report_html_directory }} + unittest_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }} + coverage_sqlite_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_sqlite }} StaticTypeCheck: uses: pyTooling/Actions/.github/workflows/StaticTypeCheck.yml@dev diff --git a/.github/workflows/ExtractConfiguration.yml b/.github/workflows/ExtractConfiguration.yml index 58f362d..781cbff 100644 --- a/.github/workflows/ExtractConfiguration.yml +++ b/.github/workflows/ExtractConfiguration.yml @@ -164,11 +164,11 @@ jobs: from tomli import load as tomli_load + unittestXMLFile = Path("./unittest.xml") coverageHTMLDirectory = Path("htmlcov") - unittestXMLFile = Path("./unittest.xml") - coverageXMLFile = Path("./coverage.xml") - coverageJSONFile = Path("./coverage.json") - coverageRC = "${{ inputs.coverage_config }}".strip() + coverageXMLFile = Path("./coverage.xml") + coverageJSONFile = Path("./coverage.json") + coverageRC = "${{ inputs.coverage_config }}".strip() # Read output paths from 'pyproject.toml' file if coverageRC == "pyproject.toml": @@ -206,10 +206,10 @@ jobs: print(f"GITHUB_OUTPUT: {github_output}") with github_output.open("a+", encoding="utf-8") as f: f.write(dedent(f"""\ - coverage_report_html_directory={coverageHTMLDirectory.as_posix()} unittest_report_xml_directory={unittestXMLFile.parent.as_posix()} unittest_report_xml_filename={unittestXMLFile.name} unittest_report_xml={unittestXMLFile.as_posix()} + coverage_report_html_directory={coverageHTMLDirectory.as_posix()} coverage_report_xml_directory={coverageXMLFile.parent.as_posix()} coverage_report_xml_filename={coverageXMLFile.name} coverage_report_xml={coverageXMLFile.as_posix()} diff --git a/.github/workflows/UnitTesting.yml b/.github/workflows/UnitTesting.yml index 0b2c189..c05c6f5 100644 --- a/.github/workflows/UnitTesting.yml +++ b/.github/workflows/UnitTesting.yml @@ -109,6 +109,11 @@ on: required: false default: 'pyproject.toml' type: string + coverage_report_html_directory: + description: '' + required: false + default: 'report/coverage/html' + type: string unittest_xml_artifact: description: "Generate unit test report with junitxml and upload results as an artifact." required: false @@ -381,8 +386,8 @@ jobs: if: inputs.coverage_html_artifact != '' continue-on-error: true run: | - coverage html --data-file=.coverage -d ${{ steps.getVariables.outputs.coverage_report_html_directory }} - rm ${{ steps.getVariables.outputs.coverage_report_html_directory }}/.gitignore + coverage html --data-file=.coverage -d ${{ inputs.coverage_report_html_directory }} + rm ${{ inputs.coverage_report_html_directory }}/.gitignore # Upload artifacts diff --git a/.github/workflows/_Checking_JobTemplates.yml b/.github/workflows/_Checking_JobTemplates.yml index 3fef625..b73bef1 100644 --- a/.github/workflows/_Checking_JobTemplates.yml +++ b/.github/workflows/_Checking_JobTemplates.yml @@ -31,11 +31,12 @@ jobs: - UnitTestingParams with: jobs: ${{ needs.UnitTestingParams.outputs.python_jobs }} - unittest_report_xml_directory: ${{ needs.ConfigParams.outputs.unittest_report_xml_directory }} - unittest_report_xml_filename: ${{ needs.ConfigParams.outputs.unittest_report_xml_filename }} - unittest_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }} - unittest_html_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_html }} - coverage_sqlite_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_sqlite }} + unittest_report_xml_directory: ${{ needs.ConfigParams.outputs.unittest_report_xml_directory }} + unittest_report_xml_filename: ${{ needs.ConfigParams.outputs.unittest_report_xml_filename }} + coverage_report_html_directory: ${{ needs.ConfigParams.outputs.coverage_report_html_directory }} + unittest_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }} + unittest_html_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_html }} + coverage_sqlite_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_sqlite }} # coverage_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_xml }} # coverage_json_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_json }} # coverage_html_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_html }} @@ -49,14 +50,15 @@ jobs: jobs: ${{ needs.PlatformTestingParams.outputs.python_jobs }} # tests_directory: "" unittest_directory: platform - unittest_report_xml_directory: ${{ needs.ConfigParams.outputs.unittest_report_xml_directory }} - unittest_report_xml_filename: ${{ needs.ConfigParams.outputs.unittest_report_xml_filename }} - unittest_xml_artifact: ${{ fromJson(needs.PlatformTestingParams.outputs.artifact_names).unittesting_xml }} - unittest_html_artifact: ${{ fromJson(needs.PlatformTestingParams.outputs.artifact_names).unittesting_html }} - coverage_sqlite_artifact: ${{ fromJson(needs.PlatformTestingParams.outputs.artifact_names).codecoverage_sqlite }} - coverage_xml_artifact: ${{ fromJson(needs.PlatformTestingParams.outputs.artifact_names).codecoverage_xml }} - coverage_json_artifact: ${{ fromJson(needs.PlatformTestingParams.outputs.artifact_names).codecoverage_json }} - coverage_html_artifact: ${{ fromJson(needs.PlatformTestingParams.outputs.artifact_names).codecoverage_html }} + unittest_report_xml_directory: ${{ needs.ConfigParams.outputs.unittest_report_xml_directory }} + unittest_report_xml_filename: ${{ needs.ConfigParams.outputs.unittest_report_xml_filename }} + coverage_report_html_directory: ${{ needs.ConfigParams.outputs.coverage_report_html_directory }} + unittest_xml_artifact: ${{ fromJson(needs.PlatformTestingParams.outputs.artifact_names).unittesting_xml }} + unittest_html_artifact: ${{ fromJson(needs.PlatformTestingParams.outputs.artifact_names).unittesting_html }} + coverage_sqlite_artifact: ${{ fromJson(needs.PlatformTestingParams.outputs.artifact_names).codecoverage_sqlite }} + coverage_xml_artifact: ${{ fromJson(needs.PlatformTestingParams.outputs.artifact_names).codecoverage_xml }} + coverage_json_artifact: ${{ fromJson(needs.PlatformTestingParams.outputs.artifact_names).codecoverage_json }} + coverage_html_artifact: ${{ fromJson(needs.PlatformTestingParams.outputs.artifact_names).codecoverage_html }} StaticTypeCheck: uses: pyTooling/Actions/.github/workflows/StaticTypeCheck.yml@dev