From c9db6e8173b456c9886e9cce6d02f46152b4216f Mon Sep 17 00:00:00 2001 From: wangmingrong1 Date: Fri, 11 Oct 2024 14:39:20 +0800 Subject: [PATCH] CI: CI Docker adds Python package installation 1. Add Python tool 'install CI' to MSYS2 platform 2. CI Python Add Package Construction Signed-off-by: wangmingrong1 --- tools/ci/docker/linux/Dockerfile | 1 + tools/ci/platforms/darwin.sh | 1 + tools/ci/platforms/linux.sh | 1 + tools/ci/platforms/msys2.sh | 7 ++++++- tools/ci/platforms/ubuntu.sh | 1 + 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile index 1cbd47320215c..6e361023c322c 100644 --- a/tools/ci/docker/linux/Dockerfile +++ b/tools/ci/docker/linux/Dockerfile @@ -387,6 +387,7 @@ RUN pip3 install cmake-format RUN pip3 install cvt2utf # Install pytest RUN pip3 install cxxfilt +RUN pip3 install construct RUN pip3 install esptool==4.8.dev4 RUN pip3 install imgtool RUN pip3 install kconfiglib diff --git a/tools/ci/platforms/darwin.sh b/tools/ci/platforms/darwin.sh index db6641c851390..b300d94b2f102 100755 --- a/tools/ci/platforms/darwin.sh +++ b/tools/ci/platforms/darwin.sh @@ -220,6 +220,7 @@ python_tools() { pip3 install \ cmake-format \ + construct \ cvt2utf \ cxxfilt \ esptool==4.8.dev4 \ diff --git a/tools/ci/platforms/linux.sh b/tools/ci/platforms/linux.sh index 2ee3dc02ea271..8421cd58c9054 100755 --- a/tools/ci/platforms/linux.sh +++ b/tools/ci/platforms/linux.sh @@ -143,6 +143,7 @@ python_tools() { pip3 install \ cmake-format \ CodeChecker \ + construct \ cvt2utf \ cxxfilt \ esptool==4.8.dev4 \ diff --git a/tools/ci/platforms/msys2.sh b/tools/ci/platforms/msys2.sh index 392cd65fdb384..5d22422cb2400 100755 --- a/tools/ci/platforms/msys2.sh +++ b/tools/ci/platforms/msys2.sh @@ -137,6 +137,11 @@ kconfig_frontends() { fi } +python_tools() { + pip3 install \ + construct +} + mips_gcc_toolchain() { add_path "${NUTTXTOOLS}"/pinguino-compilers/windows64/p32/bin @@ -283,7 +288,7 @@ install_build_tools() { mkdir -p "${NUTTXTOOLS}" echo "#!/usr/bin/env sh" > "${NUTTXTOOLS}"/env.sh - install="arm_clang_toolchain arm_gcc_toolchain arm64_gcc_toolchain kconfig_frontends riscv_gcc_toolchain rust" + install="arm_clang_toolchain arm_gcc_toolchain arm64_gcc_toolchain kconfig_frontends riscv_gcc_toolchain rust python_tools" oldpath=$(cd . && pwd -P) for func in ${install}; do diff --git a/tools/ci/platforms/ubuntu.sh b/tools/ci/platforms/ubuntu.sh index 792b9f5185d9a..a268de1e7993b 100755 --- a/tools/ci/platforms/ubuntu.sh +++ b/tools/ci/platforms/ubuntu.sh @@ -196,6 +196,7 @@ python_tools() { pip3 install \ cmake-format \ CodeChecker \ + construct \ cvt2utf \ cxxfilt \ esptool==4.8.dev4 \