From 17f76998dbc5bbea92e60b00fa0b8087947d1fd2 Mon Sep 17 00:00:00 2001 From: Almir Okato Date: Thu, 4 Jul 2024 11:46:00 +0200 Subject: [PATCH] ci: update required esptool version to 4.8.dev4 This esptool version is required when building the default Simple Boot for Espressif chips. Signed-off-by: Almir Okato --- tools/ci/docker/linux/Dockerfile | 4 ++-- tools/ci/platforms/darwin.sh | 2 +- tools/ci/platforms/linux.sh | 2 +- tools/ci/platforms/ubuntu.sh | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile index 9cf88f8e3be3d..78b43ca5c09fd 100644 --- a/tools/ci/docker/linux/Dockerfile +++ b/tools/ci/docker/linux/Dockerfile @@ -125,7 +125,7 @@ FROM nuttx-toolchain-base AS nuttx-toolchain-avr32 # Download the prebuilt AVR32 GCC toolchain RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq \ git -# Clone Main Repository +# Clone Main Repository RUN mkdir -p gcc-avr32-gnu && \ git clone --depth 1 https://github.com/ramangopalan/avr32-gnu-toolchain-linux_x86 gcc-avr32-gnu @@ -346,7 +346,7 @@ RUN pip3 install cmake-format RUN pip3 install cvt2utf # Install pytest RUN pip3 install cxxfilt -RUN pip3 install esptool +RUN pip3 install esptool==4.8.dev4 RUN pip3 install imgtool RUN pip3 install kconfiglib RUN pip3 install pexpect==4.8.0 diff --git a/tools/ci/platforms/darwin.sh b/tools/ci/platforms/darwin.sh index eaa7905c7ad3c..c9338bae735b5 100755 --- a/tools/ci/platforms/darwin.sh +++ b/tools/ci/platforms/darwin.sh @@ -211,7 +211,7 @@ python_tools() { cmake-format \ cvt2utf \ cxxfilt \ - esptool==4.5.1 \ + esptool==4.8.dev4 \ imgtool==1.9.0 \ kconfiglib \ pexpect==4.8.0 \ diff --git a/tools/ci/platforms/linux.sh b/tools/ci/platforms/linux.sh index b78ca2c2bdc83..bf953c12aa727 100755 --- a/tools/ci/platforms/linux.sh +++ b/tools/ci/platforms/linux.sh @@ -143,7 +143,7 @@ python_tools() { CodeChecker \ cvt2utf \ cxxfilt \ - esptool \ + esptool==4.8.dev4 \ imgtool \ kconfiglib \ pexpect==4.8.0 \ diff --git a/tools/ci/platforms/ubuntu.sh b/tools/ci/platforms/ubuntu.sh index a3cffd9eba936..e545b4f5aba2b 100755 --- a/tools/ci/platforms/ubuntu.sh +++ b/tools/ci/platforms/ubuntu.sh @@ -84,7 +84,7 @@ arm64_gcc_toolchain() { avr_gcc_toolchain() { if ! type avr-gcc > /dev/null 2>&1; then - sudo apt-get install -y binutils-avr gcc-avr avr-libc + sudo apt-get install -y binutils-avr gcc-avr avr-libc fi command avr-gcc --version @@ -196,7 +196,7 @@ python_tools() { CodeChecker \ cvt2utf \ cxxfilt \ - esptool \ + esptool==4.8.dev4 \ imgtool \ kconfiglib \ pexpect==4.8.0 \