Merge branch 'hathach:master' into non-blocking-host-v2

4 files changed, 107 insertions, 201 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 352875a9d..9d8b90f5a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,8 +47,6 @@ jobs:
               - '.github/workflows/ci_set_matrix.py'
 
   set-matrix:
-    needs: [ check-paths ]
-    if: needs.check-paths.outputs.code_changed == 'true'
     runs-on: ubuntu-latest
     outputs:
       json: ${{ steps.set-matrix-json.outputs.matrix }}
@@ -75,7 +73,7 @@ jobs:
   # For Make and IAR build: will be done on CircleCI only (one random per family as well)
   # ------------------------------------------------------------------------------
   cmake:
-    needs: set-matrix
+    needs: [ check-paths, set-matrix ]
     uses: ./.github/workflows/build_util.yml
     strategy:
       fail-fast: false
@@ -93,10 +91,14 @@ jobs:
       build-args: ${{ toJSON(fromJSON(needs.set-matrix.outputs.json)[matrix.toolchain]) }}
       build-options: '--one-first'
       upload-metrics: true
-      upload-artifacts: true
+      upload-artifacts: false
+      upload-membrowse: true
+      code-changed: ${{ needs.check-paths.outputs.code_changed == 'true' }}
+    secrets: inherit
 
   code-metrics:
-    needs: cmake
+    needs: [ check-paths, cmake ]
+    if: needs.check-paths.outputs.code_changed == 'true'
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
@@ -200,11 +202,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ windows-latest, macos-latest ]
+        build-system: [ 'make', 'cmake' ]
     with:
       os: ${{ matrix.os }}
-      build-system: 'cmake-make'
+      build-system: ${{ matrix.build-system }}
       toolchain: 'arm-gcc-${{ matrix.os }}'
-      build-args: '["stm32h7"]'
+      build-args: '["stm32h7rs"]'
       build-options: '--one-random'
 
   # ---------------------------------------
@@ -213,7 +216,8 @@ jobs:
   zephyr:
     needs: [ check-paths ]
     # skip zephyr build due to failed build, fix later
-    if: false && needs.check-paths.outputs.code_changed == 'true'
+    if: false
+    #if: needs.check-paths.outputs.code_changed == 'true'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout TinyUSB
@@ -235,8 +239,8 @@ jobs:
   # Run on PR only (hil-tinyusb), hil-hfp only run on non-forked PR
   # ---------------------------------------
   hil-build:
-    needs: set-matrix
-    if: github.repository_owner == 'hathach'
+    needs: [ check-paths, set-matrix ]
+    if: needs.check-paths.outputs.code_changed == 'true' && github.repository_owner == 'hathach'
     uses: ./.github/workflows/build_util.yml
     strategy:
       fail-fast: false
@@ -297,6 +301,7 @@ jobs:
   hil-hfp:
     needs: [ check-paths ]
     if: |
+      needs.check-paths.outputs.code_changed == 'true' &&
       github.repository_owner == 'hathach' &&
       !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true)
     runs-on: [ self-hosted, Linux, X64, hifiphile ]
@@ -331,53 +336,3 @@ jobs:
 
       - name: Test on actual hardware (hardware in the loop)
         run: python3 test/hil/hil_test.py hfp.json
-
-  # ---------------------------------------
-  # Membrowse Memory Analysis
-  # Push: always runs (uses identical for doc-only to maintain commit chain)
-  # PR: only runs if code changed (doc-only PRs skip entirely)
-  # ---------------------------------------
-  membrowse:
-    needs: [check-paths, cmake]
-    if: |
-      always() && !cancelled() && (
-        github.event_name == 'push' ||
-        github.event_name == 'release' ||
-        github.event_name == 'workflow_dispatch' ||
-        (github.event_name == 'pull_request' && needs.check-paths.outputs.code_changed == 'true')
-      )
-    permissions:
-      contents: read
-      actions: read
-    uses: ./.github/workflows/membrowse-report.yml
-    with:
-      code_changed: ${{ needs.check-paths.outputs.code_changed == 'true' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' }}
-    secrets: inherit
-
-  membrowse-comment:
-    needs: membrowse
-    # skip membrowse comment since it is too verbal
-    if: false && github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      actions: read
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Download report artifacts
-        id: download
-        uses: actions/download-artifact@v5
-        with:
-          pattern: membrowse-report-*
-          path: reports
-          merge-multiple: true
-        continue-on-error: true
-
-      - name: Upload Membrowse Comment Artifact
-        if: steps.download.outcome == 'success'
-        uses: actions/upload-artifact@v5
-        with:
-          name: membrowse-comment
-          path: reports/
diff --git a/.github/workflows/build_util.yml b/.github/workflows/build_util.yml
index e62c10ca1..d03c9af81 100644
--- a/.github/workflows/build_util.yml
+++ b/.github/workflows/build_util.yml
@@ -3,6 +3,10 @@ name: Reusable build util
 on:
   workflow_call:
     inputs:
+      os:
+        required: false
+        type: string
+        default: 'ubuntu-latest'
       build-system:
         required: true
         type: string
@@ -24,10 +28,14 @@ on:
         required: false
         default: false
         type: boolean
-      os:
+      upload-membrowse:
         required: false
-        type: string
-        default: 'ubuntu-latest'
+        default: false
+        type: boolean
+      code-changed:
+        required: false
+        default: true
+        type: boolean
 
 jobs:
   family:
@@ -39,6 +47,8 @@ jobs:
     steps:
       - name: Checkout TinyUSB
         uses: actions/checkout@v6
+        with:
+          fetch-depth: ${{ !inputs.upload-membrowse && 1 || 0 }}
 
       - name: Setup Toolchain
         id: setup-toolchain
@@ -52,42 +62,40 @@ jobs:
           arg: ${{ matrix.arg }}
 
       - name: Build
+        if: ${{ inputs.code-changed }}
         env:
           IAR_LMS_BEARER_TOKEN: ${{ secrets.IAR_LMS_BEARER_TOKEN }}
-          TOOLCHAIN: ${{ inputs.toolchain }}
         run: |
-          if [ "$TOOLCHAIN" == "esp-idf" ]; then
-            docker run --rm -v $PWD:/project -w /project espressif/idf:tinyusb python tools/build.py ${{ matrix.arg }}
-          elif [ "${{ inputs.build-system }}" == "cmake-make" ] || [ "${{ inputs.build-system }}" == "make-cmake" ]; then
-            python tools/build.py -s make ${{ steps.setup-toolchain.outputs.build_option }} ${{ inputs.build-options }} ${{ matrix.arg }}
-            python tools/build.py -s cmake ${{ steps.setup-toolchain.outputs.build_option }} ${{ inputs.build-options }} ${{ matrix.arg }}
+          if [ "${{ inputs.toolchain }}" == "esp-idf" ]; then
+            docker run --rm -e MEMBROWSE_API_KEY="$MEMBROWSE_API_KEY" -v $PWD:/project -w /project espressif/idf:tinyusb python tools/build.py --target all ${{ matrix.arg }}
           else
-            python tools/build.py -s ${{ inputs.build-system }} ${{ steps.setup-toolchain.outputs.build_option }} ${{ inputs.build-options }} ${{ matrix.arg }}
+            BUILD_PY_ARGS="-s ${{ inputs.build-system }} ${{ steps.setup-toolchain.outputs.build_option }} ${{ inputs.build-options }} --target all"
+            if [ "${{ inputs.upload-metrics }}" = "true" ]; then
+              BUILD_PY_ARGS="$BUILD_PY_ARGS --target tinyusb_metrics"
+            fi
+            python tools/build.py $BUILD_PY_ARGS ${{ matrix.arg }}
           fi
         shell: bash
 
+      - name: Membrowse Upload
+        if: inputs.toolchain != 'esp-idf' && inputs.upload-membrowse == true
+        env:
+          MEMBROWSE_API_KEY: ${{ secrets.MEMBROWSE_API_KEY }}
+        run: |
+          # if code-changed is false --> there is no elf -> membrowse target upload with --identical flag
+          BUILD_PY_ARGS="-s ${{ inputs.build-system }} ${{ steps.setup-toolchain.outputs.build_option }} ${{ inputs.build-options }}"
+          python tools/build.py $BUILD_PY_ARGS --target examples-membrowse-upload -j 1 ${{ matrix.arg }}
+        shell: bash
+
       - name: Upload Artifacts for Metrics
-        if: ${{ inputs.upload-metrics }}
+        if: inputs.upload-metrics == true && inputs.code-changed == true
         uses: actions/upload-artifact@v5
         with:
           name: metrics-${{ matrix.arg }}
           path: cmake-build/cmake-build-*/metrics.json
 
-      - name: Copy linker scripts for artifacts
-        if: ${{ inputs.upload-artifacts }}
-        run: |
-          for dir in cmake-build/cmake-build-*; do
-            board=$(basename "$dir" | sed 's/cmake-build-//')
-            ld_path=$(jq -r --arg b "$board" '.targets[] | select(.board == $b) | .ld // empty' .github/membrowse-targets.json)
-            if [ -n "$ld_path" ] && [ -f "$ld_path" ]; then
-              mkdir -p "cmake-build/$(dirname "$ld_path")"
-              cp "$ld_path" "cmake-build/$ld_path"
-            fi
-          done
-        shell: bash
-
       - name: Upload Artifacts for Hardware Testing
-        if: ${{ inputs.upload-artifacts }}
+        if: inputs.upload-artifacts == true && inputs.code-changed == true
         uses: actions/upload-artifact@v5
         with:
           name: binaries-${{ matrix.arg }}
diff --git a/.github/workflows/ci_set_matrix.py b/.github/workflows/ci_set_matrix.py
index 05a48b6c9..cd7dfa76b 100755
--- a/.github/workflows/ci_set_matrix.py
+++ b/.github/workflows/ci_set_matrix.py
@@ -15,32 +15,76 @@ toolchain_list = [
 
 # family: [supported toolchain]
 family_list = {
-    "at32f45x at32f402_405 at32f403a_407 at32f413 at32f415 at32f423 at32f425 at32f435_437": ["arm-gcc"],
-    "broadcom_32bit da1469x": ["arm-gcc"],
+    "at32f402_405": ["arm-gcc"],
+    "at32f403a_407": ["arm-gcc"],
+    "at32f413": ["arm-gcc"],
+    "at32f415": ["arm-gcc"],
+    "at32f423": ["arm-gcc"],
+    "at32f425": ["arm-gcc"],
+    "at32f435_437": ["arm-gcc"],
+    "at32f45x": ["arm-gcc"],
+    "broadcom_32bit": ["arm-gcc"],
     "broadcom_64bit": ["aarch64-gcc"],
-    "ch32v10x ch32v20x ch32v30x fomu gd32vf103 hpmicro": ["riscv-gcc"],
+    "ch32v10x": ["riscv-gcc"],
+    "ch32v20x": ["riscv-gcc"],
+    "ch32v30x": ["riscv-gcc"],
+    "da1469x": ["arm-gcc"],
+    "fomu": ["riscv-gcc"],
+    "gd32vf103": ["riscv-gcc"],
+    "hpmicro": ["riscv-gcc"],
     "imxrt": ["arm-gcc", "arm-clang"],
-    "kinetis_k kinetis_kl kinetis_k32l2": ["arm-gcc", "arm-clang"],
-    "lpc11 lpc13 lpc15 lpc17 lpc18 lpc40 lpc43": ["arm-gcc", "arm-clang"],
-    "lpc51 lpc54 lpc55": ["arm-gcc", "arm-clang"],
-    "maxim mcx mm32 msp432e4 rw61x tm4c": ["arm-gcc"],
+    "kinetis_k": ["arm-gcc", "arm-clang"],
+    "kinetis_k32l2": ["arm-gcc", "arm-clang"],
+    "kinetis_kl": ["arm-gcc", "arm-clang"],
+    "lpc11": ["arm-gcc", "arm-clang"],
+    "lpc13": ["arm-gcc", "arm-clang"],
+    "lpc15": ["arm-gcc", "arm-clang"],
+    "lpc17": ["arm-gcc", "arm-clang"],
+    "lpc18": ["arm-gcc", "arm-clang"],
+    "lpc40": ["arm-gcc", "arm-clang"],
+    "lpc43": ["arm-gcc", "arm-clang"],
+    "lpc51": ["arm-gcc", "arm-clang"],
+    "lpc54": ["arm-gcc", "arm-clang"],
+    "lpc55": ["arm-gcc", "arm-clang"],
+    "maxim": ["arm-gcc"],
+    "mcx": ["arm-gcc"],
+    "mm32": ["arm-gcc"],
     "msp430": ["msp430-gcc"],
+    "msp432e4": ["arm-gcc"],
     "nrf": ["arm-gcc", "arm-clang"],
-    "nuc100_120 nuc121_125 nuc126 nuc505 xmc4000": ["arm-gcc"],
+    "nuc100_120": ["arm-gcc"],
+    "nuc121_125": ["arm-gcc"],
+    "nuc126": ["arm-gcc"],
+    "nuc505": ["arm-gcc"],
     "ra": ["arm-gcc"],
     "rp2040": ["arm-gcc"],
+    "rw61x": ["arm-gcc"],
     "rx": ["rx-gcc"],
-    "samd11 samd2x_l2x samd5x_e5x samg": ["arm-gcc", "arm-clang"],
-    "stm32c0 stm32f0 stm32f1 stm32f2 stm32f3": ["arm-gcc", "arm-clang", "arm-iar"],
+    "samd11": ["arm-gcc", "arm-clang"],
+    "samd2x_l2x": ["arm-gcc", "arm-clang"],
+    "samd5x_e5x": ["arm-gcc", "arm-clang"],
+    "samg": ["arm-gcc", "arm-clang"],
+    "stm32c0": ["arm-gcc", "arm-clang", "arm-iar"],
+    "stm32f0": ["arm-gcc", "arm-clang", "arm-iar"],
+    "stm32f1": ["arm-gcc", "arm-clang", "arm-iar"],
+    "stm32f2": ["arm-gcc", "arm-clang", "arm-iar"],
+    "stm32f3": ["arm-gcc", "arm-clang", "arm-iar"],
     "stm32f4": ["arm-gcc", "arm-clang", "arm-iar"],
     "stm32f7": ["arm-gcc", "arm-clang", "arm-iar"],
-    "stm32g0 stm32g4 stm32h5": ["arm-gcc", "arm-clang", "arm-iar"],
+    "stm32g0": ["arm-gcc", "arm-clang", "arm-iar"],
+    "stm32g4": ["arm-gcc", "arm-clang", "arm-iar"],
+    "stm32h5": ["arm-gcc", "arm-clang", "arm-iar"],
     "stm32h7": ["arm-gcc", "arm-clang", "arm-iar"],
-    "stm32h7rs stm32l0 stm32l4": ["arm-gcc", "arm-clang", "arm-iar"],
+    "stm32h7rs": ["arm-gcc", "arm-clang", "arm-iar"],
+    "stm32l0": ["arm-gcc", "arm-clang", "arm-iar"],
+    "stm32l4": ["arm-gcc", "arm-clang", "arm-iar"],
     "stm32n6": ["arm-gcc"],
-    "stm32u0 stm32u5": ["arm-gcc", "arm-clang", "arm-iar"],
-    "stm32wb stm32wba": ["arm-gcc", "arm-clang", "arm-iar"],
-    # "-bespressif_s2_devkitc": ["esp-idf"],
+    "stm32u0": ["arm-gcc", "arm-clang", "arm-iar"],
+    "stm32u5": ["arm-gcc", "arm-clang", "arm-iar"],
+    "stm32wb": ["arm-gcc", "arm-clang", "arm-iar"],
+    "stm32wba": ["arm-gcc", "arm-clang", "arm-iar"],
+    "tm4c": ["arm-gcc"],
+    "xmc4000": ["arm-gcc"],
     # S3, P4 will be built by hil test
     # "-bespressif_s3_devkitm": ["esp-idf"],
     # "-bespressif_p4_function_ev": ["esp-idf"],
diff --git a/.github/workflows/membrowse-report.yml b/.github/workflows/membrowse-report.yml
deleted file mode 100644
index 0667418e6..000000000
--- a/.github/workflows/membrowse-report.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-name: Membrowse Memory Report
-
-on:
-  workflow_call:
-    inputs:
-      code_changed:
-        description: 'Whether code paths changed (true) or doc-only (false)'
-        type: boolean
-        required: true
-
-permissions:
-  contents: read
-  actions: read
-
-jobs:
-  load-targets:
-    runs-on: ubuntu-latest
-    outputs:
-      targets: ${{ steps.load.outputs.targets }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Load target matrix
-        id: load
-        run: echo "targets=$(jq -c '.targets' .github/membrowse-targets.json)" >> $GITHUB_OUTPUT
-
-  analyze:
-    needs: [load-targets]
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include: ${{ fromJson(needs.load-targets.outputs.targets) }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          submodules: recursive
-
-      # Download artifacts when code changed (build artifacts available)
-      - name: Download build artifacts
-        if: inputs.code_changed
-        id: download
-        uses: actions/download-artifact@v5
-        with:
-          pattern: binaries-*
-          path: cmake-build
-          merge-multiple: true
-        continue-on-error: true
-
-      - name: Restore linker scripts
-        if: inputs.code_changed
-        run: cp -r cmake-build/hw . 2>/dev/null || true
-
-      - name: Check if ELF exists
-        id: check-elf
-        run: |
-          if [ -f "cmake-build/cmake-build-${{ matrix.board }}/device/${{ matrix.example }}/${{ matrix.example }}.elf" ]; then
-            echo "exists=true" >> $GITHUB_OUTPUT
-          else
-            echo "exists=false" >> $GITHUB_OUTPUT
-          fi
-
-      # Run with actual ELF analysis when build artifacts available
-      - name: Run Membrowse Analysis
-        if: steps.check-elf.outputs.exists == 'true'
-        id: membrowse
-        continue-on-error: true
-        uses: membrowse/membrowse-action@v1
-        with:
-          target_name: ${{ matrix.port }}-${{ matrix.board }}-${{ matrix.example }}
-          elf: cmake-build/cmake-build-${{ matrix.board }}/device/${{ matrix.example }}/${{ matrix.example }}.elf
-          ld: ${{ matrix.ld }}
-          linker_vars: ${{ matrix.linker_vars || '' }}
-          api_key: ${{ secrets.MEMBROWSE_API_KEY }}
-          api_url: ${{ vars.MEMBROWSE_API_URL }}
-          verbose: INFO
-
-      # Run with identical=true when no ELF (doc-only push)
-      # Preserves the chain of commits in membrowse tracking
-      - name: Run Membrowse Identical Report
-        if: steps.check-elf.outputs.exists == 'false'
-        id: membrowse-identical
-        continue-on-error: true
-        uses: membrowse/membrowse-action@v1
-        with:
-          target_name: ${{ matrix.port }}-${{ matrix.board }}-${{ matrix.example }}
-          identical: true
-          api_key: ${{ secrets.MEMBROWSE_API_KEY }}
-          api_url: ${{ vars.MEMBROWSE_API_URL }}
-          verbose: INFO
-
-      - name: Upload report artifact
-        if: steps.membrowse.outcome == 'success' || steps.membrowse-identical.outcome == 'success'
-        uses: actions/upload-artifact@v5
-        with:
-          name: membrowse-report-${{ matrix.port }}-${{ matrix.board }}-${{ matrix.example }}
-          path: ${{ steps.membrowse.outputs.report_path || steps.membrowse-identical.outputs.report_path }}