merged commits from main

Author: leoli51

.github/workflows/build.yml

@@ -15,6 +15,10 @@ on:
 jobs:
   test:
     runs-on: ubuntu-20.04
+    outputs:
+      arm-boards: ${{ steps.set-matrix.outputs.arm-boards }}
+      riscv-boards: ${{ steps.set-matrix.outputs.riscv-boards }}
+      espressif-boards: ${{ steps.set-matrix.outputs.espressif-boards }}
     steps:
     - name: Dump GitHub context
       env:
@@ -43,9 +47,6 @@ jobs:
       run: |
         gcc --version
         python3 --version
-    - name: New boards check
-      run: python3 -u ci_new_boards_check.py
-      working-directory: tools
     - name: Duplicate USB VID/PID Check
       run: python3 -u -m tools.ci_check_duplicate_usb_vid_pid
     - name: Build and Validate Stubs
@@ -79,6 +80,10 @@ jobs:
     - name: Test all
       run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py -j1
       working-directory: tests
+    - name: Print failure info
+      run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py -j1 --print-failures
+      if: failure()
+      working-directory: tests
     - name: Native Tests
       run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py -j1 --emit native
       working-directory: tests
@@ -135,6 +140,29 @@ jobs:
         # setup.py sdist was run by 'make stubs'
         [ -z "$TWINE_USERNAME" ] || echo "Uploading dev release to PyPi"
         [ -z "$TWINE_USERNAME" ] || twine upload circuitpython-stubs/dist/*
+    - uses: dorny/paths-filter@v2
+      id: filter
+      with:
+        # Enable listing of files matching each filter.
+        # Paths to files will be available in `${FILTER_NAME}_files` output variable.
+        # Paths will be formatted as JSON array
+        list-files: json
+
+        # Compare against this branch. (Ignored for PRs.)
+        base: ${{ github.ref }}
+
+        # In this example all changed files are passed to the following action to do
+        # some custom processing.
+        filters: |
+          changed:
+            - '**'
+    - name: "Set boards to build"
+      id: set-matrix
+      working-directory: tools
+      env:
+        CHANGED_FILES: ${{ steps.filter.outputs.changed_files }}
+      run: |
+        python3 -u ci_changed_board_list.py
 
   mpy-cross-mac:
     runs-on: macos-10.15
@@ -199,198 +227,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        board:
-        - "8086_commander"
-        - "ADM_B_NRF52840_1"
-        - "TG-Watch"
-        - "adafruit_feather_rp2040"
-        - "adafruit_itsybitsy_rp2040"
-        - "adafruit_macropad_rp2040"
-        - "adafruit_neokey_trinkey_m0"
-        - "adafruit_proxlight_trinkey_m0"
-        - "adafruit_qt2040_trinkey"
-        - "adafruit_qtpy_rp2040"
-        - "adafruit_rotary_trinkey_m0"
-        - "adafruit_slide_trinkey_m0"
-        - "aloriumtech_evo_m51"
-        - "aramcon2_badge"
-        - "aramcon_badge_2019"
-        - "arduino_mkr1300"
-        - "arduino_mkrzero"
-        - "arduino_nano_33_ble"
-        - "arduino_nano_33_iot"
-        - "arduino_nano_rp2040_connect"
-        - "arduino_zero"
-        - "bast_pro_mini_m0"
-        - "bastble"
-        - "bdmicro_vina_d21"
-        - "bdmicro_vina_d51"
-        - "bdmicro_vina_d51_pcb7"
-        - "bless_dev_board_multi_sensor"
-        - "blm_badge"
-        - "capablerobot_usbhub"
-        - "catwan_usbstick"
-        - "circuitbrains_basic_m0"
-        - "circuitbrains_deluxe_m4"
-        - "circuitplayground_bluefruit"
-        - "circuitplayground_express"
-        - "circuitplayground_express_crickit"
-        - "circuitplayground_express_displayio"
-        - "clue_nrf52840_express"
-        - "cp32-m4"
-        - "cp_sapling_m0"
-        - "cp_sapling_m0_revb"
-        - "cp_sapling_m0_spiflash"
-        - "cytron_maker_pi_rp2040"
-        - "datalore_ip_m4"
-        - "datum_distance"
-        - "datum_imu"
-        - "datum_light"
-        - "datum_weather"
-        - "dynalora_usb"
-        - "dynossat_edu_eps"
-        - "dynossat_edu_obc"
-        - "electronut_labs_blip"
-        - "electronut_labs_papyr"
-        - "escornabot_makech"
-        - "espruino_pico"
-        - "espruino_wifi"
-        - "feather_bluefruit_sense"
-        - "feather_m0_adalogger"
-        - "feather_m0_basic"
-        - "feather_m0_express"
-        - "feather_m0_express_crickit"
-        - "feather_m0_rfm69"
-        - "feather_m0_rfm9x"
-        - "feather_m0_supersized"
-        - "feather_m4_can"
-        - "feather_m4_express"
-        - "feather_m7_1011"
-        - "feather_mimxrt1011"
-        - "feather_mimxrt1062"
-        - "feather_nrf52840_express"
-        - "feather_stm32f405_express"
-        - "fluff_m0"
-        - "gemma_m0"
-        - "grandcentral_m4_express"
-        - "hallowing_m0_express"
-        - "hallowing_m4_express"
-        - "hiibot_bluefi"
-        - "huntercat_nfc"
-        - "ikigaisense_vita"
-        - "imxrt1010_evk"
-        - "imxrt1020_evk"
-        - "imxrt1060_evk"
-        - "itsybitsy_m0_express"
-        - "itsybitsy_m4_express"
-        - "itsybitsy_nrf52840_express"
-        - "kicksat-sprite"
-        - "loc_ber_m4_base_board"
-        - "makerdiary_m60_keyboard"
-        - "makerdiary_nrf52840_m2_devkit"
-        - "makerdiary_nrf52840_mdk"
-        - "makerdiary_nrf52840_mdk_usb_dongle"
-        - "matrixportal_m4"
-        - "melopero_shake_rp2040"
-        - "meowbit_v121"
-        - "meowmeow"
-        - "metro_m0_express"
-        - "metro_m4_airlift_lite"
-        - "metro_m4_express"
-        - "metro_m7_1011"
-        - "metro_nrf52840_express"
-        - "microbit_v2"
-        - "mini_sam_m4"
-        - "monster_m4sk"
-        - "ndgarage_ndbit6"
-        - "ndgarage_ndbit6_v2"
-        - "neopixel_trinkey_m0"
-        - "nfc_copy_cat"
-        - "nice_nano"
-        - "nucleo_f746zg"
-        - "nucleo_f767zi"
-        - "nucleo_h743zi_2"
-        - "ohs2020_badge"
-        - "openbook_m4"
-        - "openmv_h7"
-        - "particle_argon"
-        - "particle_boron"
-        - "particle_xenon"
-        - "pca10056"
-        - "pca10059"
-        - "pca10100"
-        - "pewpew10"
-        - "pewpew_m4"
-        - "picoplanet"
-        - "pimoroni_keybow2040"
-        - "pimoroni_pga2040"
-        - "pimoroni_picolipo_16mb"
-        - "pimoroni_picolipo_4mb"
-        - "pimoroni_picosystem"
-        - "pimoroni_tiny2040"
-        - "pitaya_go"
-        - "pyb_nano_v2"
-        - "pybadge"
-        - "pyboard_v11"
-        - "pycubed"
-        - "pycubed_mram"
-        - "pygamer"
-        - "pyportal"
-        - "pyportal_titano"
-        - "pyruler"
-        - "qtpy_m0"
-        - "qtpy_m0_haxpress"
-        - "raspberry_pi_pico"
-        - "raytac_mdbt50q-db-40"
-        - "robohatmm1_m4"
-        - "sam32"
-        - "same54_xplained"
-        - "seeeduino_wio_terminal"
-        - "seeeduino_xiao"
-        - "sensebox_mcu"
-        - "serpente"
-        - "shirtty"
-        - "silicognition-m4-shim"
-        - "simmel"
-        - "snekboard"
-        - "sparkfun_lumidrive"
-        - "sparkfun_micromod_rp2040"
-        - "sparkfun_nrf52840_micromod"
-        - "sparkfun_nrf52840_mini"
-        - "sparkfun_pro_micro_rp2040"
-        - "sparkfun_qwiic_micro_no_flash"
-        - "sparkfun_qwiic_micro_with_flash"
-        - "sparkfun_redboard_turbo"
-        - "sparkfun_samd21_dev"
-        - "sparkfun_samd21_mini"
-        - "sparkfun_samd51_micromod"
-        - "sparkfun_samd51_thing_plus"
-        - "sparkfun_thing_plus_rp2040"
-        - "spresense"
-        - "stackrduino_m0_pro"
-        - "stm32f411ce_blackpill"
-        - "stm32f411ce_blackpill_with_flash"
-        - "stm32f411ve_discovery"
-        - "stm32f412zg_discovery"
-        - "stm32f4_discovery"
-        - "stm32f746g_discovery"
-        - "stringcar_m0_express"
-        - "teensy40"
-        - "teensy41"
-        - "teknikio_bluebird"
-        - "thunderpack_v11"
-        - "thunderpack_v12"
-        - "tinkeringtech_scoutmakes_azul"
-        - "trellis_m4_express"
-        - "trinket_m0"
-        - "trinket_m0_haxpress"
-        - "uartlogger2"
-        - "uchip"
-        - "ugame10"
-        - "winterbloom_big_honking_button"
-        - "winterbloom_sol"
-        - "xinabox_cc03"
-        - "xinabox_cs11"
+        board: ${{ fromJSON(needs.test.outputs.arm-boards) }}
+    if: ${{ needs.test.outputs.arm-boards != '[]' }}
 
     steps:
     - name: Set up Python 3.8
@@ -440,8 +278,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        board:
-        - "fomu"
+        board: ${{ fromJSON(needs.test.outputs.riscv-boards) }}
+    if: ${{ needs.test.outputs.riscv-boards != '[]' }}
 
     steps:
     - name: Set up Python 3.8
@@ -456,7 +294,7 @@ jobs:
     - name: Install deps
       run: |
         sudo apt-get install -y gettext
-        pip install requests sh click setuptools awscli
+        pip install -r requirements-dev.txt
         wget https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
         sudo tar -C /usr --strip-components=1 -xaf riscv64-unknown-elf-gcc-8.3.0-2019.08.0-x86_64-linux-centos6.tar.gz
     - name: Versions
@@ -484,36 +322,14 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       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'))
-  build-xtensa:
+  build-espressif:
     runs-on: ubuntu-20.04
     needs: test
     strategy:
       fail-fast: false
       matrix:
-        board:
-        - "adafruit_feather_esp32s2_nopsram"
-        - "adafruit_feather_esp32s2_tftback_nopsram"
-        - "adafruit_funhouse"
-        - "adafruit_magtag_2.9_grayscale"
-        - "adafruit_metro_esp32s2"
-        - "artisense_rd00"
-        - "atmegazero_esp32s2"
-        - "electroniccats_bastwifi"
-        - "espressif_kaluga_1"
-        - "espressif_kaluga_1.3"
-        - "espressif_saola_1_wroom"
-        - "espressif_saola_1_wrover"
-        - "franzininho_wifi_wroom"
-        - "franzininho_wifi_wrover"
-        - "lilygo_ttgo_t8_s2_st7789"
-        - "microdev_micro_s2"
-        - "muselab_nanoesp32_s2_wroom"
-        - "muselab_nanoesp32_s2_wrover"
-        - "targett_module_clip_wroom"
-        - "targett_module_clip_wrover"
-        - "unexpectedmaker_feathers2"
-        - "unexpectedmaker_feathers2_prerelease"
-        - "unexpectedmaker_tinys2"
+        board: ${{ fromJSON(needs.test.outputs.espressif-boards) }}
+    if: ${{ needs.test.outputs.espressif-boards != '[]' }}
 
     steps:
     - name: Set up Python 3.8
@@ -532,28 +348,28 @@ jobs:
       id: idf-cache
       with:
         path: ${{ github.workspace }}/.idf_tools
-        key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210716
+        key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-20210716
     - name: Clone IDF submodules
       run: |
         (cd $IDF_PATH && git submodule update --init)
       env:
-        IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
+        IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
     - name: Install IDF tools
       run: |
         $IDF_PATH/tools/idf_tools.py --non-interactive install required
         $IDF_PATH/tools/idf_tools.py --non-interactive install cmake
         $IDF_PATH/tools/idf_tools.py --non-interactive install-python-env
         rm -rf $IDF_TOOLS_PATH/dist
       env:
-        IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
+        IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
         IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
     - name: Install CircuitPython deps
       run: |
         source $IDF_PATH/export.sh
         pip install -r requirements-dev.txt
         sudo apt-get install -y gettext ninja-build
       env:
-        IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
+        IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
         IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
     - name: Versions
       run: |
@@ -565,7 +381,7 @@ jobs:
         cmake --version
       shell: bash
       env:
-        IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
+        IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
         IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
     - name: mpy-cross
       run: make -C mpy-cross -j2
@@ -578,7 +394,7 @@ jobs:
       working-directory: tools
       shell: bash
       env:
-        IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
+        IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
         IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
         BOARDS: ${{ matrix.board }}
     - uses: actions/upload-artifact@v2

.github/workflows/ports_windows.yml

@@ -99,8 +99,8 @@ jobs:
 # https://github.com/espressif/esp-idf/issues/7062
 #
 #    - name: prepare esp
-#      run: ports/esp32s2/esp-idf/install.bat
+#      run: ports/espressif/esp-idf/install.bat
 #      shell: cmd
 #
 #    - name: build esp
-#      run: . ports/esp32s2/esp-idf/export.sh && make -j2 -C ports/esp32s2 BOARD=adafruit_metro_esp32s2
+#      run: . ports/espressif/esp-idf/export.sh && make -j2 -C ports/espressif BOARD=adafruit_metro_esp32s2