WIP

.github/actions/workflow-build/action.yml

@@ -33,7 +33,7 @@ inputs:
 outputs:
   workflow:
     description: "The dispatchable workflows"
-    value: ${{ steps.outputs.outputs.WORKFLOW }}
+    value: ${{ toJSON(steps.outputs.outputs.WORKFLOW) }}
 
 runs:
   using: "composite"

.github/workflows/ci-workflow-pull-request.yml

@@ -60,22 +60,48 @@ jobs:
             ${{ env.pr_worflow }}
             ${{ env.nightly_workflow }}
 
-  run-workflow:
-    name: Run workflow
+  dispatch-groups-linux-two-stage:
+    name: ${{ matrix.name }}
     needs: build-workflow
+    if: toJSON(fromJSON(needs.build-workflow.outputs.workflow).linux_two_stage.keys) != '[]'
     permissions:
       id-token: write
       contents: read
-    uses: ./.github/workflows/workflow-dispatch.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        name: ${{ fromJSON(needs.build-workflow.outputs.workflow).linux_two_stage.keys }}
+    uses: ./.github/workflows/workflow-dispatch-two-stage-group-linux.yml
     with:
-      workflow: ${{ needs.build-workflow.outputs.workflow }}
+      name: ${{ matrix.name }}
+      pc-array: ${{ toJSON(fromJSON(needs.build-workflow.outputs.workflow).linux_two_stage.jobs[matrix.name]) }}
+
+  debug-workflow:
+    name: "Debug workflow"
+    needs: build-workflow
+    runs-on: ubuntu-latest
+    steps:
+      - name: Debug
+        if: ${{ fromJSON(needs.build-workflow.outputs.workflow) }}
+        run: |
+          echo "Debugging workflow..."
+
+  # run-workflow:
+    # name: Run workflow
+    # needs: build-workflow
+    # permissions:
+      # id-token: write
+      # contents: read
+    # uses: ./.github/workflows/workflow-dispatch.yml
+    # with:
+      # workflow: ${{ needs.build-workflow.outputs.workflow }}
 
   verify-workflow:
     name: Verify and summarize workflow results
     if: ${{ always() && !cancelled() }}
     needs:
       - build-workflow
-      - run-workflow
+      - dispatch-groups-linux-two-stage
     permissions:
       contents: read
       pull-requests: write # Posts a comment back to the PR.

.github/workflows/workflow-dispatch.yml

@@ -12,29 +12,3 @@ on:
         required: true
 
 jobs:
-  dispatch-groups-linux-two-stage:
-    if: ${{ fromJSON(inputs.workflow)['linux_two_stage']['keys'] }}
-    name: ${{ matrix.name }}
-    permissions:
-      id-token: write
-      contents: read
-    strategy:
-      fail-fast: false
-      matrix:
-        include: ${{ fromJSON(inputs.workflow)['linux_two_stage']['keys'] }}
-    uses: ./.github/workflows/workflow-dispatch-two-stage-group-linux.yml
-    with:
-      name: ${{ matrix.name }}
-      pc-array: ${{ toJSON(fromJSON(inputs.workflow)['linux_two_stage']['jobs'][matrix.name]) }}
-
-  debug-workflow:
-    name: "Debug workflow-dispatch.yml"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Debug
-        run: |
-          echo "Debugging workflow:"
-          echo "Workflow:\n ${{inputs.workflow }}\n\n"
-          # echo "Linux Two Stage:\n${{ fromJSON(inputs.workflow)['linux_two_stage'] }}\n\n"
-          # echo "Keys:\n${{ fromJSON(inputs.workflow)['linux_two_stage']['keys'] }}\n\n"
-          # echo "Jobs:\n${{ fromJSON(inputs.workflow)['linux_two_stage']['jobs'] }}\n\n"