TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

tools/ci.sh: Clean the correct MPY files when batch compiling.

Browse Source 
This commit fixes a small yet harmless issue that occurs when invoking
`ci_native_mpy_modules_build` on a persistent environment, as only X64
MPY files would be removed by the cleaning process.

Now the correct architecture is passed at all times when cleaning before
building a natmod for a particular architecture, forcing a full build of
all files to better simulate the CI environment (where there's no state
persisted between runs for this step).

Signed-off-by: Alessandro Gatti <a.gatti@frob.it>
This commit is contained in:
Alessandro Gatti
2025-06-04 07:07:02 +02:00
committed by Damien George
parent e8c92240e2
commit 193603dbac
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/ci.sh
View File

@@ -526,14 +526,14 @@ function ci_native_mpy_modules_build {
fi fi
for natmod in deflate features1 features3 features4 framebuf heapq random re for natmod in deflate features1 features3 features4 framebuf heapq random re
do do
make -C examples/natmod/$natmod clean make -C examples/natmod/$natmod ARCH=$arch clean
make -C examples/natmod/$natmod ARCH=$arch make -C examples/natmod/$natmod ARCH=$arch
done done
# features2 requires soft-float on armv7m, rv32imc, and xtensa. On armv6m # features2 requires soft-float on armv7m, rv32imc, and xtensa. On armv6m
# the compiler generates absolute relocations in the object file # the compiler generates absolute relocations in the object file
# referencing soft-float functions, which is not supported at the moment. # referencing soft-float functions, which is not supported at the moment.
make -C examples/natmod/features2 clean make -C examples/natmod/features2 ARCH=$arch clean
if [ $arch = "rv32imc" ] || [ $arch = "armv7m" ] || [ $arch = "xtensa" ]; then if [ $arch = "rv32imc" ] || [ $arch = "armv7m" ] || [ $arch = "xtensa" ]; then
make -C examples/natmod/features2 ARCH=$arch MICROPY_FLOAT_IMPL=float make -C examples/natmod/features2 ARCH=$arch MICROPY_FLOAT_IMPL=float
elif [ $arch != "armv6m" ]; then elif [ $arch != "armv6m" ]; then
@@ -542,7 +542,7 @@ function ci_native_mpy_modules_build {
# btree requires thread local storage support on rv32imc. # btree requires thread local storage support on rv32imc.
if [ $arch != "rv32imc" ]; then if [ $arch != "rv32imc" ]; then
make -C examples/natmod/btree clean make -C examples/natmod/btree ARCH=$arch clean
make -C examples/natmod/btree ARCH=$arch make -C examples/natmod/btree ARCH=$arch
fi fi
} }