Merge remote-tracking branch 'adafruit/main' into micropython-v1.27-merge

Author: dhalbert

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

@@ -19,15 +19,15 @@ runs:
       shell: bash
 
     - name: Cache IDF submodules
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           .git/modules/ports/espressif/esp-idf
           ports/espressif/esp-idf
         key: submodules-idf-${{ steps.idf-commit.outputs.commit }}
 
     - name: Cache IDF tools
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ${{ env.IDF_TOOLS_PATH }}
         key: ${{ runner.os }}-${{ env.pythonLocation }}-tools-idf-${{ steps.idf-commit.outputs.commit }}

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

@@ -3,11 +3,18 @@ name: Fetch Zephyr port deps
 runs:
   using: composite
   steps:
-    - name: Get libusb and mtools
+    - name: Get Linux build dependencies
       if: runner.os == 'Linux'
       run: |
+        echo "--- cpu model ---"
+        grep "model name" /proc/cpuinfo | head -1
+        sudo dpkg --add-architecture i386
         sudo apt-get update
-        sudo apt-get install -y libusb-1.0-0-dev libudev-dev mtools
+        sudo apt-get install -y libusb-1.0-0-dev libudev-dev pkg-config mtools
+        # We have to hold python3 so the following install works. See https://github.com/actions/runner-images/issues/13803
+        sudo apt-mark hold python3
+        sudo apt-get install -y libsdl2-dev:i386 libsdl2-image-dev:i386
+        echo "PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" >> $GITHUB_ENV
       shell: bash
     - name: Setup Zephyr project
       uses: zephyrproject-rtos/action-zephyr-setup@v1

.github/actions/deps/python/action.yml

@@ -16,15 +16,15 @@ runs:
     - name: Cache python dependencies
       id: cache-python-deps
       if: inputs.action == 'cache'
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: .cp_tools
         key: ${{ runner.os }}-${{ env.pythonLocation }}-tools-cp-${{ hashFiles('requirements-dev.txt') }}
 
     - name: Restore python dependencies
       id: restore-python-deps
       if: inputs.action == 'restore'
-      uses: actions/cache/restore@v4
+      uses: actions/cache/restore@v5
       with:
         path: .cp_tools
         key: ${{ runner.os }}-${{ env.pythonLocation }}-tools-cp-${{ hashFiles('requirements-dev.txt') }}

.github/actions/deps/submodules/action.yml

@@ -48,15 +48,15 @@ runs:
 
     - name: Cache submodules
       if: ${{ inputs.action == 'cache' }}
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ".git/modules/\n${{ join(fromJSON(steps.create-submodule-status.outputs.submodules), '\n') }}"
         key: submodules-common-${{ hashFiles('submodule_status') }}
         enableCrossOsArchive: true
 
     - name: Restore submodules
       if: ${{ inputs.action == 'restore' }}
-      uses: actions/cache/restore@v4
+      uses: actions/cache/restore@v5
       with:
         path: ".git/modules/\n${{ join(fromJSON(steps.create-submodule-status.outputs.submodules), '\n') }}"
         key: submodules-common-${{ hashFiles('submodule_status') }}

.github/actions/mpy_cross/action.yml

@@ -16,7 +16,7 @@ runs:
       id: download-mpy-cross
       if: inputs.download == 'true'
       continue-on-error: true
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v8
       with:
         name: mpy-cross
         path: mpy-cross/build
@@ -36,7 +36,7 @@ runs:
     - name: Upload mpy-cross
       if: inputs.download == 'false' || steps.download-mpy-cross.outcome == 'failure'
       continue-on-error: true
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: mpy-cross
         path: mpy-cross/build/mpy-cross

.github/workflows/build-board-custom.yml

@@ -70,7 +70,7 @@ jobs:
       run: |
         > custom-build && git add custom-build
     - name: Set up python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.x
     - name: Board to port
@@ -124,7 +124,7 @@ jobs:
       run: make -j4 $FLAGS BOARD="$BOARD" DEBUG=$DEBUG TRANSLATION="$TRANSLATION"
       working-directory: ports/${{ steps.board-to-port.outputs.port }}
     - name: Upload artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: ${{ inputs.board }}-${{ inputs.language }}-${{ inputs.version }}${{ inputs.flags != '' && '-custom' || '' }}${{ inputs.debug && '-debug' || '' }}
         path: ports/${{ steps.board-to-port.outputs.port }}/build-${{ inputs.board }}/firmware.*

.github/workflows/build-boards.yml

@@ -29,15 +29,15 @@ jobs:
         board: ${{ fromJSON(inputs.boards) }}
     steps:
     - name: Set up repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         submodules: false
         show-progress: false
         fetch-depth: 1
         persist-credentials: false
 
     - name: Set up python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.x
 
@@ -87,7 +87,7 @@ jobs:
         HEAD_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: ${{ matrix.board }}
         path: bin/${{ matrix.board }}

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

@@ -28,14 +28,14 @@ jobs:
       OS_static-raspbian: linux-raspbian
     steps:
     - name: Set up repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         submodules: false
         show-progress: false
         fetch-depth: 1
         persist-credentials: false
     - name: Set up python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.x
     - name: Set up submodules
@@ -66,7 +66,7 @@ jobs:
         echo >> $GITHUB_ENV "OS=$OS"
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: mpy-cross.${{ env.EX }}
         path: mpy-cross/build-${{ matrix.mpy-cross }}/mpy-cross.${{ env.EX }}

.github/workflows/build.yml

@@ -28,14 +28,14 @@ jobs:
       env:
         GITHUB_CONTEXT: ${{ toJson(github) }}
     - name: Set up repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         submodules: false
         show-progress: false
         fetch-depth: 1
         persist-credentials: false
     - name: Set up python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.x
     - name: Duplicate USB VID/PID check
@@ -114,14 +114,14 @@ jobs:
       CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
     steps:
     - name: Set up repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         submodules: false
         show-progress: false
         fetch-depth: 1
         persist-credentials: false
     - name: Set up python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.x
     - name: Set up submodules
@@ -133,7 +133,7 @@ jobs:
         msgfmt --version
     - name: Build mpy-cross (arm64)
       run: make -C mpy-cross -j4 -f Makefile.m1 V=2
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v7
       with:
         name: mpy-cross-macos-arm64
         path: mpy-cross/build-arm64/mpy-cross-arm64
@@ -156,14 +156,14 @@ jobs:
       CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
     steps:
     - name: Set up repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         submodules: false
         show-progress: false
         fetch-depth: 1
         persist-credentials: false
     - name: Set up python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.x
     - name: Set up submodules
@@ -177,20 +177,20 @@ jobs:
         pip install -r requirements-doc.txt
     - name: Build and Validate Stubs
       run: make check-stubs -j4
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v7
       with:
         name: stubs
         path: circuitpython-stubs/dist/*
     - name: Test Documentation Build (HTML)
       run: sphinx-build -E -W -b html -D version="$CP_VERSION" -D release="$CP_VERSION" . _build/html
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v7
       with:
         name: docs-html
         path: _build/html
     - name: Test Documentation Build (LaTeX/PDF)
       run: |
         make latexpdf
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v7
       with:
         name: docs-latexpdf
         path: _build/latex
@@ -260,7 +260,7 @@ jobs:
         which python; python --version; python -c "import cascadetoml"
         which python3; python3 --version; python3 -c "import cascadetoml"
     - name: Set up repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         submodules: false
         show-progress: false
@@ -295,13 +295,13 @@ jobs:
       CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
     steps:
     - name: Set up repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         submodules: false
         show-progress: false
         fetch-depth: 1
         persist-credentials: false
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       with:
         python-version: '3.13'
     - name: Set up Zephyr

.github/workflows/bundle_cron.yml

@@ -29,18 +29,18 @@ jobs:
     if: startswith(github.repository, 'adafruit/')
     steps:
     - name: Set up Python 3.12
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.12
     - name: Load contributor cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         key: "contributor-cache"
         path: "contributors.json"
     - name: Versions
       run: |
         python3 --version
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         repository: 'adafruit/adabot'
         submodules: true