Fix matrix configuration in impl

Signed-off-by: Michal Czyz <[email protected]>
antmicro · Apr 2, 2024 · 5e4ff73 · 5e4ff73
1 parent 1d2fbc6
commit 5e4ff73
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/.github/workflows/xls-modules-dma.yml b/.github/workflows/xls-modules-dma.yml
@@ -150,7 +150,7 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 60
     outputs:
-      json_config: ${{ env.json_config }}
+      json_rules: ${{ env.json_rules }}
     steps:
       - uses: actions/checkout@v4
 
@@ -159,7 +159,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get -qqy --no-install-recommends install jq
-          echo "json_config=$(jq -c . .github/workflows/xls-modules-dma.json)" | tee -a "$GITHUB_ENV"
+          echo "json_rules=$(jq -rc .${{ env.XLS_MODULE_NAME }}.rules .github/workflows/xls-modules-${{ env.XLS_MODULE_NAME }}.json)" | tee -a "$GITHUB_ENV"
 
   implement:
     needs: config-matrix
@@ -168,7 +168,7 @@ jobs:
     timeout-minutes: 600
     strategy:
       fail-fast: false
-      matrix: ${{ fromJson( needs.config-matrix.outputs.json_config ) }}
+      matrix: ${{ fromJson( needs.config-matrix.outputs.json_rules ) }}
     steps:
       - uses: actions/checkout@v4
 
@@ -194,27 +194,27 @@ jobs:
 
       - name: IR
         run: |
-          bazel run -c opt ${{ env.BAZEL_RESOURCES_OPT }} -- ${{matrix.dma.name}}:${{ matrix.dma.rules.ir }}
+          bazel run -c opt ${{ env.BAZEL_RESOURCES_OPT }} -- ${{ env.XLS_MODULE }}:${{ matrix.ir }}
 
       - name: Verilog
         run: |
-          bazel build -c opt ${{ env.BAZEL_RESOURCES_OPT }} -- ${{matrix.dma.name}}:${{ matrix.dma.rules.verilog }}
+          bazel build -c opt ${{ env.BAZEL_RESOURCES_OPT }} -- ${{ env.XLS_MODULE }}:${{ matrix.verilog }}
 
       - name: Synthesis
         run: |
-          bazel run -c opt ${{ env.BAZEL_RESOURCES_OPT }} -- ${{matrix.dma.name}}:${{ matrix.dma.rules.synthesis }}
+          bazel run -c opt ${{ env.BAZEL_RESOURCES_OPT }} -- ${{ env.XLS_MODULE }}:${{ matrix.synthesis }}
 
       - name: P&R
         run: |
-          bazel build -c opt ${{ env.BAZEL_RESOURCES_OPT }} -- ${{matrix.dma.name}}:${{ matrix.dma.rules.pnr }}
+          bazel build -c opt ${{ env.BAZEL_RESOURCES_OPT }} -- ${{ env.XLS_MODULE }}:${{ matrix.pnr }}
 
         # ${variable/character_to_replace/new_character}
         # ${variable/ slash / underscore }
       - name: Prepare artifact name
         if: always()
         shell: bash
         run: |
-          name_input=${{env.XLS_MODULE}}/${{ matrix.module.rule_ir }}
+          name_input=${{env.XLS_MODULE}}/${{ matrix.ir }}
           name_output="${name_input//\//_}"
           echo "artifact_name=${name_output}" >> "$GITHUB_ENV"