diff --git a/.github/workflows/CompletePipeline.yml b/.github/workflows/CompletePipeline.yml index fd94427..fc60c8f 100644 --- a/.github/workflows/CompletePipeline.yml +++ b/.github/workflows/CompletePipeline.yml @@ -258,10 +258,10 @@ jobs: # coverage_xml_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_xml }} # coverage_report_xml_directory: ${{ needs.ConfigParams.outputs.coverage_report_xml_directory }} # coverage_report_xml_filename: ${{ needs.ConfigParams.outputs.coverage_report_xml_filename }} - coverage_json_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_json }} coverage_report_json: ${{ needs.ConfigParams.outputs.coverage_report_json }} - coverage_html_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_html }} coverage_report_html: ${{ needs.ConfigParams.outputs.coverage_report_html }} + coverage_json_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_json }} + coverage_html_artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).codecoverage_html }} codecov: ${{ inputs.codecov }} codacy: ${{ inputs.codacy }} secrets: @@ -390,10 +390,10 @@ jobs: if: needs.Prepare.outputs.is_release_tag == 'true' with: python_version: ${{ needs.UnitTestingParams.outputs.python_version }} - requirements: -r dist/requirements.txt - artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).package_all }} + requirements: '-r dist/requirements.txt' + artifact: ${{ fromJson(needs.UnitTestingParams.outputs.artifact_names).package_all }} secrets: - PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} + PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} ArtifactCleanUp: uses: pyTooling/Actions/.github/workflows/ArtifactCleanUp.yml@dev diff --git a/.github/workflows/Parameters.yml b/.github/workflows/Parameters.yml index cd2f415..9bc245e 100644 --- a/.github/workflows/Parameters.yml +++ b/.github/workflows/Parameters.yml @@ -163,9 +163,12 @@ jobs: package_name = "${{ inputs.package_name }}".strip() name = "${{ inputs.name }}".strip() - if package_namespace == "" or package_namespace == ".": - package_fullname = f"{package_name}" - package_directory = f"{package_name}" + if package_namespace == "": # or package_namespace == ".": + package_fullname = package_name + package_directory = package_name + elif package_namespace[-2:] == ".*": + package_fullname = package_namespace[:-2] + package_directory = package_namespace[:-2] else: package_fullname = f"{package_namespace}.{package_name}" package_directory = f"{package_namespace}/{package_name}" diff --git a/.github/workflows/_Checking_JobTemplates.yml b/.github/workflows/_Checking_JobTemplates.yml index 8cdf343..34cab02 100644 --- a/.github/workflows/_Checking_JobTemplates.yml +++ b/.github/workflows/_Checking_JobTemplates.yml @@ -11,25 +11,27 @@ jobs: ConfigParams: uses: pyTooling/Actions/.github/workflows/ExtractConfiguration.yml@dev - InstallParams: - uses: pyTooling/Actions/.github/workflows/Parameters.yml@dev - with: - package_name: myPackage - python_version_list: '' - UnitTestingParams: uses: pyTooling/Actions/.github/workflows/Parameters.yml@dev with: - name: myPackage - python_version_list: '3.9 3.10 3.11 3.12 3.13 pypy-3.10 pypy-3.11' - disable_list: 'windows-arm:pypy-3.10 windows-arm:pypy-3.11' + package_name: 'myPackage' + python_version_list: '3.9 3.10 3.11 3.12 3.13 3.14 pypy-3.10 pypy-3.11' + disable_list: 'windows-arm:pypy-3.10 windows-arm:pypy-3.11' PlatformTestingParams: uses: pyTooling/Actions/.github/workflows/Parameters.yml@dev with: - name: Platform + package_name: 'myPackage' + name: 'Platform' + python_version_list: '' + system_list: 'ubuntu ubuntu-arm windows windows-arm macos mingw64 clang64 ucrt64' + + InstallParams: + uses: pyTooling/Actions/.github/workflows/Parameters.yml@dev + with: + package_name: 'myPackage' + python_version: ${{ needs.UnitTestingParams.outputs.python_version }} python_version_list: '' - system_list: 'ubuntu ubuntu-arm windows windows-arm macos mingw64 clang64 ucrt64' UnitTesting: uses: pyTooling/Actions/.github/workflows/UnitTesting.yml@dev