Skip to content

Commit d90efde

Browse files
committed
tools/ci: Add c_module() testing for RP2 and STM32 ports.
Update CI scripts to test c_module() functionality: - Remove USER_C_MODULES from ESP32 and RP2 CI builds (now using c_module() in manifest_test.py) - Add ci_stm32_build_cmod function to test c_module() on STM32 - Update RP2 CI to use FROZEN_MANIFEST with manifest_test.py This ensures c_module() is tested across multiple ports during CI. Signed-off-by: Andrew Leech <[email protected]>
1 parent 1cd78b7 commit d90efde

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.github/workflows/ports_stm32.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
matrix:
2525
ci_func: # names are functions in ci.sh
2626
- stm32_pyb_build
27+
- stm32_build_cmod
2728
- stm32_nucleo_build
2829
- stm32_misc_build
2930
runs-on: ubuntu-22.04

tools/ci.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ function ci_esp32_build_cmod_spiram_s2 {
220220
ci_esp32_build_common
221221

222222
make ${MAKEOPTS} -C ports/esp32 \
223-
USER_C_MODULES=../../../examples/usercmodule/micropython.cmake \
224223
FROZEN_MANIFEST=$(pwd)/ports/esp32/boards/manifest_test.py
225224

226225
# Test building native .mpy with xtensawin architecture.
@@ -454,7 +453,7 @@ function ci_rp2_build {
454453
make ${MAKEOPTS} -C ports/rp2 submodules
455454
make ${MAKEOPTS} -C ports/rp2
456455
make ${MAKEOPTS} -C ports/rp2 BOARD=RPI_PICO_W submodules
457-
make ${MAKEOPTS} -C ports/rp2 BOARD=RPI_PICO_W USER_C_MODULES=../../examples/usercmodule/micropython.cmake
456+
make ${MAKEOPTS} -C ports/rp2 BOARD=RPI_PICO_W FROZEN_MANIFEST=$(pwd)/ports/rp2/boards/manifest_test.py
458457
make ${MAKEOPTS} -C ports/rp2 BOARD=RPI_PICO2 submodules
459458
make ${MAKEOPTS} -C ports/rp2 BOARD=RPI_PICO2
460459
make ${MAKEOPTS} -C ports/rp2 BOARD=W5100S_EVB_PICO submodules
@@ -504,6 +503,12 @@ function ci_stm32_pyb_build {
504503
make ${MAKEOPTS} -C ports/stm32/mboot BOARD=STM32F769DISC CFLAGS_EXTRA='-DMBOOT_ADDRESS_SPACE_64BIT=1 -DMBOOT_SDCARD_ADDR=0x100000000ULL -DMBOOT_SDCARD_BYTE_SIZE=0x400000000ULL -DMBOOT_FSLOAD=1 -DMBOOT_VFS_FAT=1'
505504
}
506505

506+
function ci_stm32_build_cmod {
507+
make ${MAKEOPTS} -C mpy-cross
508+
make ${MAKEOPTS} -C ports/stm32 MICROPY_PY_NETWORK_WIZNET5K=5200 submodules
509+
make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_NETWORK_WIZNET5K=5200 FROZEN_MANIFEST=$(pwd)/ports/stm32/boards/manifest_test.py
510+
}
511+
507512
function ci_stm32_nucleo_build {
508513
make ${MAKEOPTS} -C mpy-cross
509514
make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_H743ZI submodules
@@ -1061,7 +1066,6 @@ function _ci_main {
10611066
exit 1
10621067
;;
10631068
(*)
1064-
set -e
10651069
cd $(dirname "$0")/..
10661070
while [ $# -ne 0 ]; do
10671071
ci_$1

0 commit comments

Comments
 (0)