You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/10/28 19:22:51 UTC
[incubator-nuttx] 01/03: tools/ci/cibuild.sh: Move all pip3 installation into python-tools
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit cdf8cff1f627c23f1647f1b3bf1c6eb8415a6137
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Fri Oct 21 13:03:35 2022 +0800
tools/ci/cibuild.sh: Move all pip3 installation into python-tools
and keep the installation in alphabetical order
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
tools/ci/cibuild.sh | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh
index 2cd066dbda..7bc38b9878 100755
--- a/tools/ci/cibuild.sh
+++ b/tools/ci/cibuild.sh
@@ -46,7 +46,7 @@ case ${os} in
brew update --quiet
;;
Linux)
- install="python-tools codechecker clang_clang-tidy gen-romfs gperf kconfig-frontends rust arm-clang-toolchain arm-gcc-toolchain arm64-gcc-toolchain mips-gcc-toolchain riscv-gcc-toolchain xtensa-esp32-gcc-toolchain rx-gcc-toolchain sparc-gcc-toolchain c-cache"
+ install="python-tools clang_clang-tidy gen-romfs gperf kconfig-frontends rust arm-clang-toolchain arm-gcc-toolchain arm64-gcc-toolchain mips-gcc-toolchain riscv-gcc-toolchain xtensa-esp32-gcc-toolchain rx-gcc-toolchain sparc-gcc-toolchain c-cache"
;;
esac
@@ -62,14 +62,16 @@ function python-tools {
PYTHONUSERBASE=${prebuilt}/pylocal
export PYTHONUSERBASE
add_path "${PYTHONUSERBASE}"/bin
+ pip3 install CodeChecker
+ pip3 install cxxfilt
+ pip3 install esptool==3.3.1
pip3 install pexpect==4.8.0
+ pip3 install pyelftools
+ pip3 install pyserial==3.5
pip3 install pytest==6.2.5
- pip3 install pytest-repeat==0.9.1
pip3 install pytest-json==0.4.0
pip3 install pytest-ordering==0.6
- pip3 install pyserial==3.5
- pip3 install pyelftools
- pip3 install cxxfilt
+ pip3 install pytest-repeat==0.9.1
# MCUboot's tool for image signing and key management
if ! command -v imgtool &> /dev/null; then
@@ -77,10 +79,6 @@ function python-tools {
fi
}
-function codechecker {
- pip3 install CodeChecker
-}
-
function clang_clang-tidy {
# Install Clang and Clang-Tidy for Ubuntu.
apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq \
@@ -282,7 +280,6 @@ function xtensa-esp32-gcc-toolchain {
esac
fi
xtensa-esp32-elf-gcc --version
- pip3 install esptool==3.3.1
}
function avr-gcc-toolchain {