Merge branch 'main' into sysvers

Author: bill88t

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

@@ -16,7 +16,7 @@ runs:
         tar -xaf dosfstools-4.2.tar.gz
         cd dosfstools-4.2
         ./configure
-        make -j 2
+        make -j4
         cd src
         echo >> $GITHUB_PATH $(pwd)
       shell: bash

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

@@ -18,15 +18,15 @@ runs:
       shell: bash
 
     - name: Cache IDF submodules
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       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@v3
+      uses: actions/cache@v4
       with:
         path: ${{ env.IDF_TOOLS_PATH }}
         key: ${{ runner.os }}-${{ env.pythonLocation }}-tools-idf-${{ steps.idf-commit.outputs.commit }}

.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@v3
+      uses: actions/cache@v4
       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@v3
+      uses: actions/cache/restore@v4
       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@v3
+      uses: actions/cache@v4
       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@v3
+      uses: actions/cache/restore@v4
       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@v3
+      uses: actions/download-artifact@v4
       with:
         name: mpy-cross
         path: mpy-cross/build
@@ -28,15 +28,15 @@ runs:
 
     - name: Build mpy-cross
       if: inputs.download == 'false' || steps.download-mpy-cross.outcome == 'failure'
-      run: make -C mpy-cross -j2
+      run: make -C mpy-cross -j4
       shell: bash
       env:
         CP_VERSION: ${{ inputs.cp-version }}
 
     - name: Upload mpy-cross
       if: inputs.download == 'false' || steps.download-mpy-cross.outcome == 'failure'
       continue-on-error: true
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: mpy-cross
         path: mpy-cross/build/mpy-cross

.github/workflows/build-boards.yml

@@ -26,22 +26,27 @@ jobs:
         board: ${{ fromJSON(inputs.boards) }}
     steps:
     - name: Set up repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: false
+        show-progress: false
         fetch-depth: 1
+
     - name: Set up python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.x
+
     - name: Set up port
       id: set-up-port
       uses: ./.github/actions/deps/ports
       with:
         board: ${{ matrix.board }}
+
     - name: Set up submodules
       id: set-up-submodules
       uses: ./.github/actions/deps/submodules
+
     - name: Set up external
       uses: ./.github/actions/deps/external
       with:
@@ -67,18 +72,21 @@ jobs:
 
     - name: Set up build failure matcher
       run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
+
     - name: Build board
       run: python3 -u build_release_files.py
       working-directory: tools
       env:
         BOARDS: ${{ matrix.board }}
         PULL: ${{ github.event.number }}
+        HEAD_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.board }}
         path: bin/${{ matrix.board }}
+
     - name: Upload to S3
       uses: ./.github/actions/upload_aws
       with:

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

@@ -28,12 +28,13 @@ jobs:
       OS_static-raspbian: linux-raspbian
     steps:
     - name: Set up repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: false
+        show-progress: false
         fetch-depth: 1
     - name: Set up python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.x
     - name: Set up submodules
@@ -53,15 +54,15 @@ jobs:
         sudo apt-get install -y mingw-w64
 
     - name: Build mpy-cross.${{ matrix.mpy-cross }}
-      run: make -C mpy-cross -j2 -f Makefile.${{ matrix.mpy-cross }}
+      run: make -C mpy-cross -j4 -f Makefile.${{ matrix.mpy-cross }}
 
     - name: Set output
       run: |
         echo >> $GITHUB_ENV "EX=${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}"
         echo >> $GITHUB_ENV "OS=${{ env[format('OS_{0}', matrix.mpy-cross)] }}"
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: mpy-cross.${{ env.EX }}
         path: mpy-cross/build-${{ matrix.mpy-cross }}/mpy-cross.${{ env.EX }}

.github/workflows/build.yml

@@ -28,12 +28,13 @@ jobs:
       env:
         GITHUB_CONTEXT: ${{ toJson(github) }}
     - name: Set up repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: false
+        show-progress: false
         fetch-depth: 1
     - name: Set up python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.x
     - name: Duplicate USB VID/PID check
@@ -108,12 +109,13 @@ jobs:
       CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
     steps:
     - name: Set up repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: false
+        show-progress: false
         fetch-depth: 1
     - name: Set up python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.x
     - name: Set up submodules
@@ -124,21 +126,21 @@ jobs:
         python3 --version
         msgfmt --version
     - name: Build mpy-cross
-      run: make -C mpy-cross -j2
-    - uses: actions/upload-artifact@v3
+      run: make -C mpy-cross -j4
+    - uses: actions/upload-artifact@v4
       with:
         name: mpy-cross-macos-11-x64
         path: mpy-cross/build/mpy-cross
     - name: Build mpy-cross (arm64)
-      run: make -C mpy-cross -j2 -f Makefile.m1 V=2
-    - uses: actions/upload-artifact@v3
+      run: make -C mpy-cross -j4 -f Makefile.m1 V=2
+    - uses: actions/upload-artifact@v4
       with:
         name: mpy-cross-macos-11-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@v3
+      uses: actions/upload-artifact@v4
       with:
         name: mpy-cross-macos-11-universal
         path: mpy-cross-macos-universal
@@ -163,12 +165,13 @@ jobs:
       CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
     steps:
     - name: Set up repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: false
+        show-progress: false
         fetch-depth: 1
     - name: Set up python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.x
     - name: Set up submodules
@@ -179,23 +182,23 @@ jobs:
         sudo apt-get install -y latexmk librsvg2-bin texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
         pip install -r requirements-doc.txt
     - name: Build and Validate Stubs
-      run: make check-stubs -j2
-    - uses: actions/upload-artifact@v3
+      run: make check-stubs -j4
+    - uses: actions/upload-artifact@v4
       with:
         name: stubs
         path: circuitpython-stubs/dist/*
     - name: Test Documentation Build (HTML)
       run: sphinx-build -E -W -b html -D version=${{ env.CP_VERSION }} -D release=${{ env.CP_VERSION }} . _build/html
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
-        name: docs
+        name: docs-html
         path: _build/html
     - name: Test Documentation Build (LaTeX/PDF)
       run: |
         make latexpdf
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
-        name: docs
+        name: docs-latexpdf
         path: _build/latex
     - name: Upload to S3
       uses: ./.github/actions/upload_aws
@@ -260,24 +263,25 @@ jobs:
         which python; python --version; python -c "import cascadetoml"
         which python3; python3 --version; python3 -c "import cascadetoml"
     - name: Set up repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: false
+        show-progress: false
         fetch-depth: 1
     - name: Set up submodules
       uses: ./.github/actions/deps/submodules
     - name: build mpy-cross
-      run: make -j2 -C mpy-cross
+      run: make -j4 -C mpy-cross
     - name: build rp2040
-      run: make -j2 -C ports/raspberrypi BOARD=adafruit_feather_rp2040 TRANSLATION=de_DE
+      run: make -j4 -C ports/raspberrypi BOARD=adafruit_feather_rp2040 TRANSLATION=de_DE
     - name: build samd21
-      run: make -j2 -C ports/atmel-samd BOARD=feather_m0_express TRANSLATION=zh_Latn_pinyin
+      run: make -j4 -C ports/atmel-samd BOARD=feather_m0_express TRANSLATION=zh_Latn_pinyin
     - name: build samd51
-      run: make -j2 -C ports/atmel-samd BOARD=feather_m4_express TRANSLATION=es
+      run: make -j4 -C ports/atmel-samd BOARD=feather_m4_express TRANSLATION=es
     - name: build nrf
-      run: make -j2 -C ports/nrf BOARD=feather_nrf52840_express TRANSLATION=fr
+      run: make -j4 -C ports/nrf BOARD=feather_nrf52840_express TRANSLATION=fr
     - name: build stm
-      run: make -j2 -C ports/stm BOARD=feather_stm32f405_express TRANSLATION=pt_BR
+      run: make -j4 -C ports/stm BOARD=feather_stm32f405_express TRANSLATION=pt_BR
     # I gave up trying to do esp builds on windows when I saw
     # ERROR: Platform MINGW64_NT-10.0-17763-x86_64 appears to be unsupported
     # https://github.com/espressif/esp-idf/issues/7062

.github/workflows/create-website-pr.yml

@@ -17,12 +17,13 @@ jobs:
       env:
         GITHUB_CONTEXT: ${{ toJson(github) }}
     - name: Set up repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: false
+        show-progress: false
         fetch-depth: 1
     - name: Set up python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.x
     - name: Set up submodules

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

@@ -42,7 +42,7 @@ jobs:
       run: |
         > custom-build && git add custom-build
     - name: Set up python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.x
     - name: Set up port
@@ -81,10 +81,10 @@ jobs:
         riscv64-unknown-elf-gcc --version || true
         mkfs.fat --version || true
     - name: Build board
-      run: make -j2 ${{ inputs.flags }} BOARD=${{ inputs.board }} DEBUG=${{ inputs.debug && '1' || '0' }} TRANSLATION=${{ inputs.language }}
+      run: make -j4 ${{ inputs.flags }} BOARD=${{ inputs.board }} DEBUG=${{ inputs.debug && '1' || '0' }} TRANSLATION=${{ inputs.language }}
       working-directory: ports/${{ steps.set-up-port.outputs.port }}
     - name: Upload artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.board }}-${{ inputs.language }}-${{ inputs.version }}${{ inputs.flags != '' && '-custom' || '' }}${{ inputs.debug && '-debug' || '' }}
         path: ports/${{ steps.set-up-port.outputs.port }}/build-${{ inputs.board }}/firmware.*