Updated pipeline.

edaa-org · Nov 6, 2022 · bfaa757 · bfaa757
1 parent 86a67de
commit bfaa757
Showing 1 changed file with 22 additions and 37 deletions.
diff --git a/.github/workflows/Pipeline.yml b/.github/workflows/Pipeline.yml
@@ -12,22 +12,23 @@ jobs:
     uses: pyTooling/Actions/.github/workflows/Parameters.yml@typing-junit
     with:
       name: pyEDAA.Launcher
+      exclude_list: "windows:3.11"
 
   UnitTesting:
     uses: pyTooling/Actions/.github/workflows/UnitTesting.yml@typing-junit
     needs:
       - Params
     with:
       jobs: ${{ needs.Params.outputs.python_jobs }}
-      artifact: ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}
+      artifact: ${{ fromJson(needs.Params.outputs.artifact_names).unittesting_xml }}
 
   Coverage:
     uses: pyTooling/Actions/.github/workflows/CoverageCollection.yml@typing-junit
     needs:
       - Params
     with:
-      python_version: ${{ fromJson(needs.Params.outputs.params).python_version }}
-      artifact: ${{ fromJson(needs.Params.outputs.params).artifacts.coverage }}
+      python_version: ${{ needs.Params.outputs.python_version }}
+      artifact: ${{ fromJson(needs.Params.outputs.artifact_names).codecoverage_html }}
     secrets:
       codacy_token: ${{ secrets.CODACY_PROJECT_TOKEN }}
 
@@ -36,15 +37,14 @@ jobs:
     needs:
       - Params
     with:
-      python_version: ${{ fromJson(needs.Params.outputs.params).python_version }}
+      python_version: ${{ needs.Params.outputs.python_version }}
       requirements: '-r tests/requirements.txt'
       commands: |
         cd pyEDAA
         mypy --junit-xml ../StaticTypingSummary.xml --html-report ../htmlmypy -p Launcher
-      html_report: 'htmlmypy'
-      html_artifact: ${{ fromJson(needs.Params.outputs.params).artifacts.typing_html }}
+      html_artifact: ${{ fromJson(needs.Params.outputs.artifact_names).statictyping_html_html }}
       junit_report: 'StaticTypingSummary.xml'
-      junit_artifact: ${{ fromJson(needs.Params.outputs.params).artifacts.typing_junit }}
+      junit_artifact: ${{ fromJson(needs.Params.outputs.artifact_names).statictyping_html_junit }}
 
   PublishTestResults:
     uses: pyTooling/Actions/.github/workflows/PublishTestResults.yml@typing-junit
@@ -53,13 +53,13 @@ jobs:
       - StaticTypeCheck
 
   Package:
-    uses: pyTooling/Actions/.github/workflows/Package.yml@r0
+    uses: pyTooling/Actions/.github/workflows/Package.yml@dev
     needs:
       - Params
       - Coverage
     with:
-      python_version: ${{ fromJson(needs.Params.outputs.params).python_version }}
-      artifact: ${{ fromJson(needs.Params.outputs.params).artifacts.package }}
+      python_version: ${{ needs.Params.outputs.python_version }}
+      artifact: ${{ fromJson(needs.Params.outputs.artifact_names).package_all }}
 
   Release:
     uses: pyTooling/Actions/.github/workflows/Release.yml@typing-junit
@@ -78,9 +78,9 @@ jobs:
       - Release
       - Package
     with:
-      python_version: ${{ fromJson(needs.Params.outputs.params).python_version }}
+      python_version: ${{ needs.Params.outputs.python_version }}
       requirements: -r dist/requirements.txt
-      artifact: ${{ fromJson(needs.Params.outputs.params).artifacts.package }}
+      artifact: ${{ fromJson(needs.Params.outputs.artifact_names).package_all }}
     secrets:
       PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
 
@@ -89,15 +89,15 @@ jobs:
 #    needs:
 #      - Params
 #    with:
-#      python_version: ${{ fromJson(needs.Params.outputs.params).python_version }}
+#      python_version: ${{ needs.Params.outputs.python_version }}
 
   BuildTheDocs:
     uses: pyTooling/Actions/.github/workflows/BuildTheDocs.yml@typing-junit
     needs:
       - Params
 #      - VerifyDocs
     with:
-      artifact: ${{ fromJson(needs.Params.outputs.params).artifacts.doc }}
+      artifact: ${{ fromJson(needs.Params.outputs.artifact_names).documentation_html }}
 
   PublishToGitHubPages:
     uses: pyTooling/Actions/.github/workflows/PublishToGitHubPages.yml@typing-junit
@@ -107,9 +107,9 @@ jobs:
       - Coverage
       - StaticTypeCheck
     with:
-      doc: ${{ fromJson(needs.Params.outputs.params).artifacts.doc }}
-      coverage: ${{ fromJson(needs.Params.outputs.params).artifacts.coverage }}
-      typing: ${{ fromJson(needs.Params.outputs.params).artifacts.typing }}
+      doc: ${{ fromJson(needs.Params.outputs.artifact_names).documentation_html }}
+      coverage: ${{ fromJson(needs.Params.outputs.artifact_names).codecoverage_html }}
+      typing: ${{ fromJson(needs.Params.outputs.artifact_names).statictyping_html }}
 
   ArtifactCleanUp:
     uses: pyTooling/Actions/.github/workflows/ArtifactCleanUp.yml@typing-junit
@@ -122,24 +122,9 @@ jobs:
       - PublishToGitHubPages
       - PublishTestResults
     with:
-      package: ${{ fromJson(needs.Params.outputs.params).artifacts.package }}
+      package: ${{ fromJson(needs.Params.outputs.artifact_names).package_all }}
       remaining: |
-        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-ubuntu-3.6
-        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-ubuntu-3.7
-        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-ubuntu-3.8
-        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-ubuntu-3.9
-        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-ubuntu-3.10
-        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-windows-3.6
-        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-windows-3.7
-        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-windows-3.8
-        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-windows-3.9
-        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-windows-3.10
-        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-msys2-3.9
-        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-macos-3.6
-        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-macos-3.7
-        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-macos-3.8
-        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-macos-3.9
-        ${{ fromJson(needs.Params.outputs.params).artifacts.unittesting }}-macos-3.10
-        ${{ fromJson(needs.Params.outputs.params).artifacts.coverage }}
-        ${{ fromJson(needs.Params.outputs.params).artifacts.typing }}
-        ${{ fromJson(needs.Params.outputs.params).artifacts.doc }}
+        ${{ fromJson(needs.Params.outputs.artifact_names).unittesting_xml }}-*
+        ${{ fromJson(needs.Params.outputs.artifact_names).codecoverage_html }}
+        ${{ fromJson(needs.Params.outputs.artifact_names).statictyping_html }}
+        ${{ fromJson(needs.Params.outputs.artifact_names).documentation_html }}