WIP

.github/actions/workflow-run-job-linux/action.yml

@@ -15,6 +15,8 @@ inputs:
 runs:
   using: "composite"
   steps:
+    # TODO We currently require a checkout to the default path before invoking this action.
+    # Clean this up so we only do a single checkout.
     - name: Checkout repo
       uses: actions/checkout@v3
       with:

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

@@ -60,22 +60,27 @@ jobs:
             ${{ env.pr_worflow }}
             ${{ env.nightly_workflow }}
 
-  run-workflow:
-    name: Run workflow
+  dispatch-groups-linux-two-stage:
+    name: ${{ matrix.name }}
     needs: build-workflow
     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]) }}
 
   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-two-stage-linux.yml

@@ -35,8 +35,12 @@ jobs:
       env:
         NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }}
     steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
       - name: Run job
-        uses: ./.github/actions/workflow-run-job-linux.yml
+        uses: ./.github/actions/workflow-run-job-linux
         with:
           id: ${{ fromJSON(inputs.producers)[0].id }}
           command: ${{ fromJSON(inputs.producers)[0].command }}
@@ -62,8 +66,12 @@ jobs:
       env:
         NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }}
     steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
       - name: Run job
-        uses: ./.github/actions/workflow-run-job-linux.yml
+        uses: ./.github/actions/workflow-run-job-linux
         with:
           id: ${{ matrix.id }}
           command: ${{ matrix.command }}

.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"