Merge branch 'adafruit:main' into main

Author: cvmanjoo

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

@@ -3,6 +3,12 @@ name: Fetch Zephyr port deps
 runs:
   using: composite
   steps:
+    - name: Get libusb
+      if: runner.os == 'Linux'
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libusb-1.0-0-dev libudev-dev
+      shell: bash
     - name: Setup Zephyr project
       uses: zephyrproject-rtos/action-zephyr-setup@v1
       with:

.github/workflows/build.yml

@@ -107,7 +107,7 @@ jobs:
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
   mpy-cross-mac:
-    runs-on: macos-13
+    runs-on: macos-latest
     needs: scheduler
     if: needs.scheduler.outputs.ports != '{}'
     env:
@@ -131,33 +131,18 @@ jobs:
         gcc --version
         python3 --version
         msgfmt --version
-    - name: Build mpy-cross
-      run: make -C mpy-cross -j4
-    - uses: actions/upload-artifact@v4
-      with:
-        name: mpy-cross-macos-x64
-        path: mpy-cross/build/mpy-cross
     - name: Build mpy-cross (arm64)
       run: make -C mpy-cross -j4 -f Makefile.m1 V=2
     - uses: actions/upload-artifact@v4
       with:
         name: mpy-cross-macos-arm64
         path: mpy-cross/build-arm64/mpy-cross-arm64
-    - name: Make universal binary
-      run: lipo -create -output mpy-cross-macos-universal mpy-cross/build/mpy-cross mpy-cross/build-arm64/mpy-cross-arm64
-    - name: Upload artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: mpy-cross-macos-universal
-        path: mpy-cross-macos-universal
     - name: Upload to S3
       if: >-
           (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
           (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
       run: |
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/macos/mpy-cross-macos-"${CP_VERSION}"-universal --no-progress --region us-east-1
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/build-arm64/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/macos/mpy-cross-macos-"${CP_VERSION}"-arm64 --no-progress --region us-east-1
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/build/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/macos/mpy-cross-macos-"${CP_VERSION}"-x64 --no-progress --region us-east-1
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

.github/workflows/run-tests.yml

@@ -23,36 +23,36 @@ jobs:
       TEST_native: --emit native
       TEST_native_mpy: --via-mpy --emit native -d basics float micropython
     steps:
-    - name: Set up repository
-      uses: actions/checkout@v4
-      with:
-        submodules: false
-        show-progress: false
-        fetch-depth: 1
-    - name: Set up python
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.12
-    - name: Set up submodules
-      uses: ./.github/actions/deps/submodules
-      with:
-        target: tests
-    - name: Set up external
-      if: matrix.test == 'all'
-      uses: ./.github/actions/deps/external
-    - name: Set up mpy-cross
-      uses: ./.github/actions/mpy_cross
-      with:
-        cp-version: ${{ inputs.cp-version }}
-    - name: Build unix port
-      run: make -C ports/unix VARIANT=coverage -j4
-    - name: Run tests
-      run: ./run-tests.py -j4 ${{ env[format('TEST_{0}', matrix.test)] }}
-      working-directory: tests
-    - name: Print failure info
-      run: ./run-tests.py -j4 --print-failures
-      if: failure()
-      working-directory: tests
+      - name: Set up repository
+        uses: actions/checkout@v4
+        with:
+          submodules: false
+          show-progress: false
+          fetch-depth: 1
+      - name: Set up python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+      - name: Set up submodules
+        uses: ./.github/actions/deps/submodules
+        with:
+          target: tests
+      - name: Set up external
+        if: matrix.test == 'all'
+        uses: ./.github/actions/deps/external
+      - name: Set up mpy-cross
+        uses: ./.github/actions/mpy_cross
+        with:
+          cp-version: ${{ inputs.cp-version }}
+      - name: Build unix port
+        run: make -C ports/unix VARIANT=coverage -j4
+      - name: Run tests
+        run: ./run-tests.py -j4 ${{ env[format('TEST_{0}', matrix.test)] }}
+        working-directory: tests
+      - name: Print failure info
+        run: ./run-tests.py -j4 --print-failures
+        if: failure()
+        working-directory: tests
     # Not working after MicroPython v1.23 merge.
     # - name: Build native modules
     #   if: matrix.test == 'all'
@@ -66,3 +66,27 @@ jobs:
     #   if: matrix.test == 'all'
     #   run: ./run-natmodtests.py extmod/{heapq*,random*,re*}.py
     #   working-directory: tests
+
+  zephyr:
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+    env:
+      CP_VERSION: ${{ inputs.cp-version }}
+    steps:
+      - name: Set up repository
+        uses: actions/checkout@v4
+        with:
+          submodules: false
+          show-progress: false
+          fetch-depth: 1
+      - name: Set up python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.13
+      - name: Set up Zephyr
+        uses: ./.github/actions/deps/ports/zephyr-cp
+      - name: Set up external
+        uses: ./.github/actions/deps/external
+      - name: Run Zephyr build tests
+        run: make -C ports/zephyr-cp test

.gitmodules

@@ -143,7 +143,7 @@
 [submodule "ports/espressif/esp-idf"]
 	path = ports/espressif/esp-idf
 	url = https://github.com/adafruit/esp-idf.git
-	branch = circuitpython-v5.4.1
+	branch = circuitpython-v5.5.1
 [submodule "ports/espressif/esp-protocols"]
 	path = ports/espressif/esp-protocols
 	url = https://github.com/adafruit/esp-protocols.git