zephyr-cp: raise the rpi_pico UDC thread stack in debug builds

.codespell/ignore-words.txt

@@ -27,3 +27,5 @@ straightaway
 ftbs
 ftb
 curren
+mabey
+rsource

.devcontainer/cortex-m-toolchain.sh

@@ -14,10 +14,10 @@ echo -e "[cortex-m-toolchain.sh] downloading and installing gcc-arm-non-eabi too
 cd /workspaces
 
 wget -qO gcc-arm-none-eabi.tar.xz \
-  https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/arm-gnu-toolchain-15.2.rel1-x86_64-arm-none-eabi.tar.xz
+  https://gitlab.arm.com/api/v4/projects/tooling%2Fgnu-toolchains-for-arm/packages/generic/gnu-toolchain/15.3.rel1/arm-gnu-toolchain-15.3.rel1-x86_64-arm-none-eabi.tar.xz
 
 tar -xJf gcc-arm-none-eabi.tar.xz
-ln -s arm-gnu-toolchain-15.2.rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
+ln -s arm-gnu-toolchain-15.3.rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
 rm -f gcc-arm-none-eabi.tar.xz
 
 echo -e "[cortex-m-toolchain.sh] update PATH in environment"

.git-blame-ignore-revs

@@ -1,3 +1,6 @@
+# all: Apply code formatting to new paths.
+48c7daaa3d7068c127c5bc395ffa72029ab9bba1
+
 # all: Prune trailing whitespace.
 dda9b9c6da5d3c31fa8769e581a753e95a270803
 

.gitattributes

@@ -13,12 +13,14 @@
 # CIRCUITPY-CHANGE: add some more binary types.
 # These are binary so should never be modified by git.
 *.a binary
+*.FLM binary
 *.ico binary
 *.png binary
 *.jpg binary
 *.dxf binary
 *.mpy binary
 *.der binary
+*.bin binary
 *.deb binary
 *.zip binary
 *.pdf binary

.github/actions/deps/external/action.yml

@@ -21,12 +21,11 @@ runs:
     - name: Get arm toolchain
       if: >-
         inputs.port != 'none' &&
-        inputs.port != 'litex' &&
         inputs.port != 'espressif' &&
         inputs.port != 'zephyr-cp'
       uses: carlosperate/arm-none-eabi-gcc-action@v1
       with:
-        release: '15.2.Rel1'
+        release: '15.3.Rel1'
 
     # espressif
     - name: Install IDF tools

.github/actions/deps/ports/action.yml

@@ -11,18 +11,10 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Set up broadcom
-      if: inputs.port == 'broadcom'
-      uses: ./.github/actions/deps/ports/broadcom
-
     - name: Set up espressif
       if: inputs.port == 'espressif'
       uses: ./.github/actions/deps/ports/espressif
 
-    - name: Set up litex
-      if: inputs.port == 'litex'
-      uses: ./.github/actions/deps/ports/litex
-
     - name: Set up nordic
       if: inputs.port == 'nordic'
       uses: ./.github/actions/deps/ports/nordic

.github/actions/deps/ports/zephyr-cp/action.yml

@@ -33,6 +33,12 @@ runs:
         app-path: zephyr-config
         base-path: ports/zephyr-cp
         toolchains: arm-zephyr-eabi
+        # The action's ccache stores a new ~150 MB entry per board job under one key
+        # shared by every board, and each job restores whichever entry was saved last.
+        # Measured across all 30 boards: hits on 5 boards by luck, none on the other 25,
+        # and no build-time difference either way. The entries were filling the
+        # repository's 10 GB Actions cache and evicting the SDK and other caches.
+        enable-ccache: false
     - name: Export cmake info
       run: west zephyr-export
       shell: bash

.github/workflows/build-boards.yml

@@ -24,7 +24,7 @@ jobs:
     env:
       CP_VERSION: ${{ inputs.cp-version }}
     strategy:
-      fail-fast: false
+      fail-fast: ${{ github.event_name == 'merge_group' }}
       matrix:
         board: ${{ fromJSON(inputs.boards) }}
     steps:
@@ -94,6 +94,17 @@ jobs:
         name: ${{ matrix.board }}
         path: bin/${{ matrix.board }}
 
+    - name: Upload firmware sizes
+      # "zz-" sorts the size records after every board in the run's artifact list.
+      if: ${{ always() }}
+      uses: actions/upload-artifact@v7
+      with:
+        name: zz-sizes-${{ matrix.board }}
+        path: sizes/${{ matrix.board }}.json
+        if-no-files-found: ignore
+        # build-ci merges these into the 0-sizes reports; delete them after one day.
+        retention-days: 1
+
     - name: Upload to S3
       uses: ./.github/actions/upload_aws
       with:

.github/workflows/build-mpy-cross.yml

@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-24.04
     strategy:
-      fail-fast: false
+      fail-fast: ${{ github.event_name == 'merge_group' }}
       matrix:
         mpy-cross: ["static", "static-aarch64", "static-mingw", "static-raspbian"]
     env:

.github/workflows/build.yml

@@ -10,11 +10,13 @@ on:
       - main
       - '*.x'
   pull_request:
+  merge_group:
+    types: [checks_requested]
   release:
     types: [published]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -69,15 +71,15 @@ jobs:
         GITHUB_TOKEN: ${{ github.token }}
         EXCLUDE_COMMIT: ${{ github.event.pull_request.head.sha }}
     - name: Set head sha (pull)
-      if: github.event_name == 'pull_request'
+      if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
       env:
-        HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+        HEAD_SHA: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
       run: echo "HEAD_SHA=$HEAD_SHA" >> $GITHUB_ENV
     - name: Set base sha (pull)
-      if: github.event_name == 'pull_request'
+      if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
       run: git cat-file -e $SHA && echo "BASE_SHA=$SHA" >> $GITHUB_ENV || true
       env:
-        SHA: ${{ steps.get-last-commit-with-checks.outputs.commit_sha || github.event.pull_request.base.sha }}
+        SHA: ${{ steps.get-last-commit-with-checks.outputs.commit_sha || github.event.pull_request.base.sha || github.event.merge_group.base_sha }}
     - name: Set head sha (push)
       if: github.event_name == 'push'
       env:
@@ -227,10 +229,107 @@ jobs:
     uses: ./.github/workflows/build-boards.yml
     secrets: inherit
     strategy:
-      fail-fast: false
+      fail-fast: ${{ github.event_name == 'merge_group' }}
+      max-parallel: 55
       matrix:
         port: ${{ fromJSON(needs.scheduler.outputs.ports).ports }}
     with:
       boards: ${{ toJSON(fromJSON(needs.scheduler.outputs.ports)[matrix.port]) }}
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
       port: ${{ fromJSON(needs.scheduler.outputs.ports).split_ports[matrix.port] || matrix.port }}
+
+  build-ci:
+    # Final gate for ruleset checks: always runs so the required check is
+    # reported, and fails if any job (or matrix leg) failed or was cancelled.
+    needs: [scheduler, tests, zephyr-tests, mpy-cross, mpy-cross-mac, docs, ports]
+    if: ${{ always() }}
+    runs-on: ubuntu-24.04
+    env:
+      CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
+    steps:
+    # Firmware size report. Each board job uploads its sizes/<board>.json as zz-sizes-<board>;
+    # merge them into one table and a job summary. This is reporting only, so none of it
+    # may fail the gate: every step continues on error.
+    - name: Set up repository
+      continue-on-error: true
+      uses: actions/checkout@v6
+      with:
+        submodules: false
+        show-progress: false
+        fetch-depth: 1
+        persist-credentials: false
+
+    # actions/download-artifact matches a pattern against a listing of the run's
+    # artifacts that stops at 1000, and a full build has more. The script fetches each
+    # board's record by exact name instead, from the board list the scheduler produced.
+    # It runs from github-script because only action steps get the artifact API token.
+    - name: Install the artifact client
+      continue-on-error: true
+      run: npm install --no-save --no-package-lock --no-audit --no-fund @actions/artifact@6
+
+    - name: Download firmware sizes
+      continue-on-error: true
+      uses: actions/github-script@v9
+      env:
+        BOARDS: ${{ needs.scheduler.outputs.ports }}
+      with:
+        script: |
+          const { pathToFileURL } = require("node:url");
+          const sizes = await import(pathToFileURL(`${process.env.GITHUB_WORKSPACE}/tools/ci_download_sizes.mjs`));
+          await sizes.downloadSizes({
+            boards: sizes.boardsFromSchedule(JSON.parse(process.env.BOARDS || "{}")),
+            outDir: "sizes",
+            info: core.info,
+            warning: core.warning,
+          });
+
+    - name: Summarize firmware sizes
+      continue-on-error: true
+      run: python3 tools/ci_firmware_sizes.py sizes sizes-report
+
+    # Uploaded unzipped, one file per artifact, so each opens directly; with
+    # `archive: false` the file name is the artifact name.
+    - name: Upload firmware size report (HTML)
+      continue-on-error: true
+      uses: actions/upload-artifact@v7
+      with:
+        path: sizes-report/0-sizes.html
+        archive: false
+        if-no-files-found: ignore
+
+    - name: Upload firmware size report (JSON)
+      continue-on-error: true
+      uses: actions/upload-artifact@v7
+      with:
+        path: sizes-report/0-sizes.json
+        archive: false
+        if-no-files-found: ignore
+
+    # The action itself only uploads on pushes to main and release branches and on
+    # published releases. The S3 names carry the version, so the directory keeps a history.
+    - name: Upload firmware size report to S3 (HTML)
+      continue-on-error: true
+      uses: ./.github/actions/upload_aws
+      with:
+        source: sizes-report/0-sizes.html
+        destination: 0-sizes/adafruit-circuitpython-sizes-${{ env.CP_VERSION }}.html
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+    - name: Upload firmware size report to S3 (JSON)
+      continue-on-error: true
+      uses: ./.github/actions/upload_aws
+      with:
+        source: sizes-report/0-sizes.json
+        destination: 0-sizes/adafruit-circuitpython-sizes-${{ env.CP_VERSION }}.json
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+    - name: Check build results
+      run: |
+        echo "Job results: ${{ toJSON(needs.*.result) }}"
+        if [[ "${{ contains(needs.*.result, 'failure') }}" == "true" ]] || [[ "${{ contains(needs.*.result, 'cancelled') }}" == "true" ]]; then
+          echo "One or more jobs failed or were cancelled"
+          exit 1
+        fi
+        echo "All build jobs succeeded"

.github/workflows/pre-commit.yml

@@ -6,10 +6,14 @@ name: pre-commit
 
 on:
   push:
+    branches-ignore:
+      - 'gh-readonly-queue/**'
   pull_request:
+  merge_group:
+    types: [checks_requested]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

.github/workflows/run-tests.yml

@@ -11,7 +11,7 @@ jobs:
   run:
     runs-on: ubuntu-24.04
     strategy:
-      fail-fast: false
+      fail-fast: ${{ github.event_name == 'merge_group' }}
       matrix:
         test: [all, mpy, native, native_mpy]
     env:

.github/workflows/run-zephyr-tests.yml

@@ -12,20 +12,20 @@ jobs:
     runs-on: ubuntu-24.04
     name: ${{ matrix.shard }}
     strategy:
-      fail-fast: false
+      fail-fast: ${{ github.event_name == 'merge_group' }}
       # One job per board family, so the bsim suites, which take the longest, run
       # side by side instead of after each other.
       matrix:
         include:
           - shard: native_sim
-            boards: native_native_sim native_native_sim_asan
-            pytest_args: tests/ --ignore=tests/bsim
+            boards: native_native_sim native_native_sim_asan native_native_sim_lfs
+            pytest_args: tests/ --ignore=tests/bsim -n $(nproc) --dist loadfile
           - shard: nrf5340bsim
             boards: native_nrf5340bsim
-            pytest_args: tests/bsim -k native_nrf5340bsim
+            pytest_args: tests/bsim -k native_nrf5340bsim -n $(nproc) --dist loadfile
           - shard: nrf54lm20bsim
             boards: native_nrf54lm20bsim
-            pytest_args: tests/bsim -k native_nrf54lm20bsim
+            pytest_args: tests/bsim -k native_nrf54lm20bsim -n $(nproc) --dist loadfile
     env:
       CP_VERSION: ${{ inputs.cp-version }}
     steps:
@@ -55,4 +55,4 @@ jobs:
         run: make -j $(nproc) everything
         working-directory: ports/zephyr-cp/tools/bsim
       - name: Run Zephyr tests
-        run: make -C ports/zephyr-cp test TEST_BOARDS="${{ matrix.boards }}" PYTEST_ARGS="${{ matrix.pytest_args }}"
+        run: make -C ports/zephyr-cp -j$(nproc) test TEST_BOARDS="${{ matrix.boards }}" PYTEST_ARGS="${{ matrix.pytest_args }}"