From 53a32fbf35550008035cff0bf96d897dff0bfce0 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Wed, 24 Sep 2025 00:17:43 +0200 Subject: [PATCH] Also use JSON objects for SphinxDocumentation. --- .github/workflows/CompletePipeline.yml | 12 +- .github/workflows/SphinxDocumentation.yml | 25 ++-- .github/workflows/_Checking_JobTemplates.yml | 14 +- doc/Instantiation.rst | 8 +- .../Documentation/LaTeXDocumentation.rst | 6 - .../Documentation/SphinxDocumentation.rst | 138 +++++++++++------- .../Quality/CheckDocumentation.rst | 6 - doc/JobTemplate/Release/TagReleaseCommit.rst | 6 - doc/JobTemplate/Setup/Parameters.rst | 6 - doc/JobTemplate/Setup/PrepareJob.rst | 6 - doc/JobTemplate/index.rst | 2 + 11 files changed, 125 insertions(+), 104 deletions(-) diff --git a/.github/workflows/CompletePipeline.yml b/.github/workflows/CompletePipeline.yml index fc60c8f..bd07107 100644 --- a/.github/workflows/CompletePipeline.yml +++ b/.github/workflows/CompletePipeline.yml @@ -301,12 +301,12 @@ jobs: # - VerifyDocs if: success() || failure() with: - python_version: ${{ needs.UnitTestingParams.outputs.python_version }} - coverage_report_json_directory: ${{ fromJson(needs.ConfigParams.outputs.coverage_report_json).directory }} - unittest_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }} - coverage_json_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_json }} - html_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_html }} - latex_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_latex }} + python_version: ${{ needs.UnitTestingParams.outputs.python_version }} + coverage_report_json: ${{ needs.ConfigParams.outputs.coverage_report_json }} + unittest_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }} + coverage_json_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_json }} + html_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_html }} + latex_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_latex }} IntermediateCleanUp: uses: pyTooling/Actions/.github/workflows/IntermediateCleanUp.yml@dev diff --git a/.github/workflows/SphinxDocumentation.yml b/.github/workflows/SphinxDocumentation.yml index ab8a21b..997faed 100644 --- a/.github/workflows/SphinxDocumentation.yml +++ b/.github/workflows/SphinxDocumentation.yml @@ -44,24 +44,29 @@ on: required: false default: 'doc' type: string - coverage_report_json_directory: - description: 'report/coverage' - required: false - type: string coverage_json_artifact: description: 'Name of the coverage JSON artifact.' required: false default: '' type: string + coverage_report_json: + description: 'Directory where coverage JSON artifact will be extracted.' + required: false + default: >- + { "directory": "report/coverage" + } + type: string unittest_xml_artifact: description: 'Name of the unittest XML artifact.' required: false default: '' type: string - unittest_xml_directory: + unittest_xml: description: 'Directory where unittest XML artifact will be extracted.' required: false - default: 'report/unit' + default: >- + { "directory": "report/unit" + } type: string html_artifact: description: 'Name of the HTML documentation artifact.' @@ -104,7 +109,7 @@ jobs: if: inputs.unittest_xml_artifact != '' with: name: ${{ inputs.unittest_xml_artifact }} - path: ${{ inputs.unittest_xml_directory }} + path: ${{ fromJson(inputs.unittest_xml).directory }} investigate: true - name: 📥 Download artifacts '${{ inputs.coverage_json_artifact }}' from 'PublishCoverageResults' job @@ -112,7 +117,7 @@ jobs: if: inputs.coverage_json_artifact != '' with: name: ${{ inputs.coverage_json_artifact }} - path: ${{ inputs.coverage_report_json_directory }} + path: ${{ fromJson(inputs.coverage_report_json).directory }} investigate: true - name: ☑ Generate HTML documentation @@ -163,7 +168,7 @@ jobs: if: inputs.unittest_xml_artifact != '' with: name: ${{ inputs.unittest_xml_artifact }} - path: ${{ inputs.unittest_xml_directory }} + path: ${{ fromJson(inputs.unittest_xml).directory }} investigate: true - name: 📥 Download artifacts '${{ inputs.coverage_json_artifact }}' from 'PublishCoverageResults' job @@ -171,7 +176,7 @@ jobs: if: inputs.coverage_json_artifact != '' with: name: ${{ inputs.coverage_json_artifact }} - path: ${{ inputs.coverage_report_json_directory }} + path: ${{ fromJson(inputs.coverage_report_json).directory }} investigate: true - name: ☑ Generate LaTeX documentation diff --git a/.github/workflows/_Checking_JobTemplates.yml b/.github/workflows/_Checking_JobTemplates.yml index 34cab02..68f28d2 100644 --- a/.github/workflows/_Checking_JobTemplates.yml +++ b/.github/workflows/_Checking_JobTemplates.yml @@ -171,13 +171,13 @@ jobs: - PublishCoverageResults # - VerifyDocs with: - python_version: ${{ needs.UnitTestingParams.outputs.python_version }} - unittest_xml_directory: ${{ fromJson(needs.ConfigParams.outputs.unittest_report_xml).directory }} - coverage_report_json_directory: ${{ fromJson(needs.ConfigParams.outputs.coverage_report_json).directory }} - unittest_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }} - coverage_json_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_json }} - html_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_html }} - latex_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_latex }} + python_version: ${{ needs.UnitTestingParams.outputs.python_version }} + unittest_xml: ${{ needs.ConfigParams.outputs.unittest_report_xml }} + coverage_report_json: ${{ needs.ConfigParams.outputs.coverage_report_json }} + unittest_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).unittesting_xml }} + coverage_json_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_json }} + html_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_html }} + latex_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).documentation_latex }} IntermediateCleanUp: uses: pyTooling/Actions/.github/workflows/IntermediateCleanUp.yml@dev diff --git a/doc/Instantiation.rst b/doc/Instantiation.rst index 296958d..54fe8fa 100644 --- a/doc/Instantiation.rst +++ b/doc/Instantiation.rst @@ -36,10 +36,13 @@ to handover input parameters to the template. on: push: workflow_dispatch: + schedule: + # Every Friday at 22:00 - rerun pipeline to check for dependency-based issues + - cron: '0 22 * * 5' jobs: : - uses: //.github/workflows/