sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tools/ci/cibuild.sh: Move all pip3 installation into python-tools

Browse Source 
and keep the installation in alphabetical order

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-10-21 13:03:35 +08:00 committed by Petro Karashchenko
parent 5bee68ebac
commit cdf8cff1f6
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/ci/cibuild.sh
View File

@ -46,7 +46,7 @@ case ${os} in
brew update --quiet brew update --quiet
;; ;;
Linux) 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 esac
@ -62,14 +62,16 @@ function python-tools {
PYTHONUSERBASE=${prebuilt}/pylocal PYTHONUSERBASE=${prebuilt}/pylocal
export PYTHONUSERBASE export PYTHONUSERBASE
add_path "${PYTHONUSERBASE}"/bin add_path "${PYTHONUSERBASE}"/bin
pip3 install CodeChecker
pip3 install cxxfilt
pip3 install esptool==3.3.1
pip3 install pexpect==4.8.0 pip3 install pexpect==4.8.0
pip3 install pyelftools
pip3 install pyserial==3.5
pip3 install pytest==6.2.5 pip3 install pytest==6.2.5
pip3 install pytest-repeat==0.9.1
pip3 install pytest-json==0.4.0 pip3 install pytest-json==0.4.0
pip3 install pytest-ordering==0.6 pip3 install pytest-ordering==0.6
pip3 install pyserial==3.5 pip3 install pytest-repeat==0.9.1
pip3 install pyelftools
pip3 install cxxfilt
# MCUboot's tool for image signing and key management # MCUboot's tool for image signing and key management
if ! command -v imgtool &> /dev/null; then if ! command -v imgtool &> /dev/null; then
@ -77,10 +79,6 @@ function python-tools {
fi fi
} }
function codechecker {
pip3 install CodeChecker
}
function clang_clang-tidy { function clang_clang-tidy {
# Install Clang and Clang-Tidy for Ubuntu. # Install Clang and Clang-Tidy for Ubuntu.
apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq \ apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq \
@ -282,7 +280,6 @@ function xtensa-esp32-gcc-toolchain {
esac esac
fi fi
xtensa-esp32-elf-gcc --version xtensa-esp32-elf-gcc --version
pip3 install esptool==3.3.1
} }
function avr-gcc-toolchain { function avr-gcc-toolchain {