Made CI CC-type agnostic.

bittide · Oct 15, 2024 · 39f41b5 · 39f41b5
1 parent 51d5fc6
commit 39f41b5
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -171,7 +171,8 @@ jobs:
           ./cargo.sh build --frozen --release
           export BITTIDE_ARTIFACT_ACCESS_TOKEN="${{ secrets.GITHUB_TOKEN }}"
           export RUNREF="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-          cabal run -- bittide-tools:cc-plot ${{ github.run_id }}:hwCcTopologyTest hitl-topology-plots
+          export TMP="${{ needs.bittide-instances-hardware-in-the-loop-test-matrix.outputs.report_kind }}"
+          cabal run -- bittide-tools:cc-plot ${{ github.run_id }}:$TMP hitl-topology-plots
 
       - name: Generate clock control reports
         run: |
@@ -182,7 +183,8 @@ jobs:
             reports/HITLT-Report.pdf
           rm hitl-topology-plots/*/report.pdf
           mkdir -p plot-sources
-          mv hitl-topology-plots plot-sources/hwCcTopologyTest
+          export TMP="${{ needs.bittide-instances-hardware-in-the-loop-test-matrix.outputs.report_kind }}"
+          mv hitl-topology-plots plot-sources/$TMP
 
       - name: Upload Reports
         uses: actions/upload-artifact@v4
@@ -505,12 +507,23 @@ jobs:
 
           echo "check_matrix=$(cat checks.json | tr '\n' ' ')" | tee -a "$GITHUB_OUTPUT"
 
-          should_generate_report=$(jq 'map(select(.top == "hwCcTopologyTest")) | length > 0' checks.json)
+          should_generate_report=$(jq 'map(select(.top == "hwCcTopologyTest" or .top == "swCcTopologyTest")) | length > 0' checks.json)
+          if [ "${should_generate_report}" == 'true' ]; then
+            tmp=$(jq 'map(select(.top == "hwCcTopologyTest")) | length > 0' checks.json)
+            report_kind=""
+            if [ "${tmp}" == 'true' ]; then
+              report_kind="hwCcTopologyTest"
+            else
+              report_kind="swCcTopologyTest"
+            fi
+            echo "report_kind=${report_kind}" | tee -a "$GITHUB_OUTPUT"
+          fi
           echo "should_generate_report=${should_generate_report}" | tee -a "$GITHUB_OUTPUT"
 
     outputs:
       check_matrix: ${{ steps.set-matrix.outputs.check_matrix }}
       should_generate_report: ${{ steps.set-matrix.outputs.should_generate_report }}
+      report_kind: ${{ steps.set-matrix.outputs.report_kind }}
 
   bittide-instances-hdl:
     name: synth