package_core: switch to multi FQBN compile-sketches

This commit removes the "link_mode" dimension from the test matrix in
package_core.yml and instead compiles both static and dynamic linking
variants of each board in the same job, to optimize the number of builds
and test runs. The "link_mode" is still recorded in the test report file
names to allow distinguishing the results, but it is no longer part of
the job name or matrix dimensions.

Author: pillo79

.github/workflows/package_core.yml

@@ -40,8 +40,6 @@ jobs:
       CORE_HASH: ${{ env.CORE_HASH }}
       # JSON describing all boards to build, collected by get_board_details.sh
       ALL_BOARD_DATA: ${{ env.ALL_BOARD_DATA }}
-      # Extended version of ALL_BOARD_DATA with link_mode alternatives added
-      ALL_BOARD_FQBNS: ${{ env.ALL_BOARD_FQBNS }}
       # List of artifacts to produce, including the "zephyr" umbrella artifact
       ARTIFACTS: ${{ env.ARTIFACTS }}
       # List of architectures the artifacts will be built for
@@ -76,7 +74,6 @@ jobs:
         run: |
           echo "## Building \`$CORE_VER\`" >> "$GITHUB_STEP_SUMMARY"
           echo "CORE_TAG=$(git describe --tags --exact-match --exclude '*/*' 2>/dev/null || echo $CORE_HASH)" >> "$GITHUB_ENV"
-          echo "ALL_BOARD_FQBNS=$(jq -c 'map((. + {link_mode: "static"}), (. + {link_mode: "dynamic"}))' <<< ${ALL_BOARD_DATA})" >> "$GITHUB_ENV"
           echo "ARTIFACTS=$(jq -c '["zephyr"] + (map(.artifact) | unique)' <<< ${ALL_BOARD_DATA})" >> "$GITHUB_ENV"
           echo "SUB_ARCHES=$(jq -c 'map(.subarch) | unique' <<< ${ALL_BOARD_DATA})" >> "$GITHUB_ENV"
           # Archive the build environment for later jobs
@@ -299,21 +296,20 @@ jobs:
 
   test-core:
     # NOTE: this name is hardcoded in ci_collect_data.py
-    name: Test ${{ matrix.board }}:${{ matrix.link_mode }}
+    name: Test ${{ matrix.board }}
     runs-on: ubuntu-latest
     needs:
       - build-env
       - package-core
     strategy:
       matrix:
         include:
-          ${{ fromJSON( needs.build-env.outputs.ALL_BOARD_FQBNS ) }}
+          ${{ fromJSON( needs.build-env.outputs.ALL_BOARD_DATA ) }}
       fail-fast: false
     env:
       PLAT: arduino:${{ matrix.subarch }}
-      FQBN: arduino:${{ matrix.subarch }}:${{ matrix.board }}:link_mode=${{ matrix.link_mode }}
       CORE_ARTIFACT: ArduinoCore-${{ matrix.artifact }}-${{ needs.build-env.outputs.CORE_HASH }}.tar.bz2
-      ARTIFACT_TAG: ${{ needs.build-env.outputs.CORE_HASH }}-${{ matrix.board }}-${{ matrix.link_mode }}
+      ARTIFACT_TAG: ${{ needs.build-env.outputs.CORE_HASH }}-${{ matrix.board }}
     if: ${{ !cancelled() && needs.build-env.result == 'success' }}
     steps:
 
@@ -333,17 +329,18 @@ jobs:
       - name: Set up core
         run: |
           tar xf ${CORE_ARTIFACT} # will create ArduinoCore-zephyr/
-          echo "REPORT_FILE=$(echo ${FQBN} | tr ':' '-').json" >> $GITHUB_ENV
 
       - name: Get test sketches
         run: |
           # sets ALL_TESTS and ALL_LIBRARIES env vars in GITHUB_ENV
           extra/ci_test_list.sh ${{ matrix.artifact }} ${{ matrix.variant }}
 
       - name: Compile tests for ${{ matrix.board }}
-        uses: pillo79/compile-sketches@next
+        uses: pillo79/compile-sketches@future
         with:
-          fqbn: ${{ env.FQBN }}
+          fqbn: |
+            - arduino:${{ matrix.subarch }}:${{ matrix.board }}:link_mode=dynamic
+            - arduino:${{ matrix.subarch }}:${{ matrix.board }}:link_mode=static
           platforms: |
             # Use Board Manager version first to install the tools
             - name: ${{ env.PLAT }}
@@ -367,10 +364,10 @@ jobs:
       - name: Prepare log
         if: ${{ success() || failure() }}
         run: |
-          # make sure to create an empty report if none was created
-          [ ! -f sketches-reports/${REPORT_FILE} ] && mkdir -p sketches-reports && echo "{}" > sketches-reports/${REPORT_FILE}
-          # remove base path of the core install from all file references to make logs cleaner
-          sed -i -e 's!/home/runner/.arduino15/packages/arduino/hardware/zephyr/[^/]*/!!g' sketches-reports/${REPORT_FILE}
+          # remove base path of the core install from all file references to make logs cleaner, if reports were found
+          if [ -d sketches-reports ] ; then
+            sed -i -e 's!/home/runner/.arduino15/packages/arduino/hardware/zephyr/[^/]*/!!g' sketches-reports/*.json
+          fi
 
       # archive the compile report for later
       - uses: actions/upload-artifact@v7

extra/ci_collect_data.py

@@ -139,13 +139,11 @@ def log_test(artifact, board, sketch, link_mode, exceptions, status, issues, job
                     exceptions.append(re.compile(f"^(ArduinoCore-zephyr/)?{sketch_pattern}"))
 
     # Get raw data from report files for both static and dynamic linking modes
-    for link_mode in ("static", "dynamic"):
-        # Get job link for this test
-        # NOTE: This must match the name used in the workflow YAML
-        job_link = JOB_URLS.get(f"Test {board}:{link_mode}")
-        if job_link:
-            job_link += "#step:6:1"
+    job_link = JOB_URLS.get(f"Test {board}")
+    if job_link:
+        job_link += "#step:6:1"
 
+    for link_mode in ("static", "dynamic"):
         # Extract data from the report file
         report_file = f"arduino-{subarch}-{board}-link_mode={link_mode}.json"
         if not os.path.exists(report_file):