variants

Author: pillo79

.github/workflows/package_core.yml

@@ -15,7 +15,7 @@ jobs:
     outputs:
       CORE_TAG: ${{ env.CORE_TAG }}
       CORE_ARTIFACT: ${{ env.CORE_ARTIFACT }}
-      BOARD_NAMES: ${{ env.BOARD_NAMES }}
+      BOARD_VARIANTS: ${{ env.BOARD_VARIANTS }}
     steps:
       - name: Install toolchain
         working-directory: /opt
@@ -30,17 +30,17 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
 
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          verbose: 1
+
       - name: Initialize
         run: |
           ./extra/bootstrap.sh -o=--filter=tree:0
           echo "CORE_TAG=$(git describe --always)" >> "$GITHUB_ENV"
           echo "CORE_ARTIFACT=ArduinoCore-zephyr-$(git describe --always)" >> "$GITHUB_ENV"
-          echo "BOARD_NAMES=[ $(cat boards.txt | grep '^[^#]*\.build\.variant' | cut -d '.' -f 1 | xargs printf '"%s",' | sed -e 's/,$//') ]" >> "$GITHUB_ENV"
-
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          verbose: 1
+          echo "BOARD_VARIANTS=[ $(cat boards.txt | grep '^[^#]*\.build\.variant' | sed -e 's/^\([^#]*\)\.build\.variant=\(.*\)/{ variant: \"\2\", board: \"\1\" }/' | sort | xargs printf '%s,' | sed -e 's/,$//') ]" >> "$GITHUB_ENV"
 
       - name: Build variants
         run: |
@@ -62,8 +62,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: package-core
     strategy:
-      matrix:
-        board: ${{ fromJSON( needs.package-core.outputs.BOARD_NAMES ) }}
+      matrix: ${{ fromJSON( needs.package-core.outputs.BOARD_VARIANTS ) }}
       fail-fast: false
     env:
       FQBN: arduino:zephyr:${{ matrix.board }}
@@ -137,7 +136,7 @@ jobs:
       - test-core
     if: ${{ !cancelled() && needs.package-core.result == 'success' }}
     env:
-      BOARD_NAMES: ${{ needs.package-core.outputs.BOARD_NAMES }}
+      BOARD_VARIANTS: ${{ needs.package-core.outputs.BOARD_VARIANTS }}
     steps:
       - uses: actions/download-artifact@v4
         with:
@@ -147,29 +146,33 @@ jobs:
 
       - run: |
           echo "### Core test results:" >> "$GITHUB_STEP_SUMMARY"
-          for BOARD in $(echo $BOARD_NAMES | jq -cr '.[]'); do
+          for BOARD_VARIANT in $(echo $BOARD_VARIANTS | jq -cr '.[]'); do
+            BOARD=$(echo $BOARD_VARIANT | jq -cr '.board')
+            VARIANT=$(echo $BOARD_VARIANT | jq -cr '.variant')
             FQBN="arduino:zephyr:$BOARD"
             REPORT_FILE="arduino-zephyr-$BOARD.json"
             if [ ! -f $REPORT_FILE ]; then
-              echo ":x: $BOARD - No report found?" >> "$GITHUB_STEP_SUMMARY"
+              echo "* :x: $BOARD ($VARIANT) - No report found?" >> "$GITHUB_STEP_SUMMARY"
             else
               REPORT=$(jq -cr '.boards[0].sketches[0]' $REPORT_FILE)
               JOB_ID=$(echo $REPORT | jq -cr '.job_id')
               JOB_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}/job/${JOB_ID}#step:5:2"
               if ! $(echo $REPORT | jq -cr '.compilation_success') ; then
-                echo ":x: [$BOARD]($JOB_URL) - **Build failed**" >> "$GITHUB_STEP_SUMMARY"
+                echo "* :x: [$BOARD ($VARIANT)]($JOB_URL) - **Build failed**" >> "$GITHUB_STEP_SUMMARY"
               else
                 WARNINGS=$(echo $REPORT | jq -cr '.warnings.current.absolute // 0')
                 if [ $WARNINGS -eq 0 ]; then
-                  echo ":white_check_mark: [$BOARD]($JOB_URL) - Build successful" >> "$GITHUB_STEP_SUMMARY"
+                  echo "* :white_check_mark: [$BOARD ($VARIANT)]($JOB_URL) - Build successful" >> "$GITHUB_STEP_SUMMARY"
                 else
-                  echo "<details><summary>:warning: <a href=\"$JOB_URL\">$BOARD</a> - $WARNINGS warnings:</summary>" >> "$GITHUB_STEP_SUMMARY"
+                  echo >> "$GITHUB_STEP_SUMMARY"
+                  echo "<details><summary>:warning: <a href=\"$JOB_URL\">$BOARD ($VARIANT)</a> - $WARNINGS warnings:</summary>" >> "$GITHUB_STEP_SUMMARY"
                   echo >> "$GITHUB_STEP_SUMMARY"
                   echo "\`\`\`" >> "$GITHUB_STEP_SUMMARY"
                   echo $REPORT | jq -cr '.warnings_log[]' >> "$GITHUB_STEP_SUMMARY"
                   echo "\`\`\`" >> "$GITHUB_STEP_SUMMARY"
                   echo >> "$GITHUB_STEP_SUMMARY"
                   echo "</details>" >> "$GITHUB_STEP_SUMMARY"
+                  echo >> "$GITHUB_STEP_SUMMARY"
                 fi
               fi
             fi