From 03614d60ee2f6e260dd6f8f2d8d0498e1d35bb4a Mon Sep 17 00:00:00 2001 From: Petro Karashchenko Date: Tue, 29 Aug 2023 14:52:59 +0300 Subject: [PATCH] tools/ci: ensure removing python and openssl related commands Signed-off-by: Petro Karashchenko --- tools/ci/cibuild.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh index e96b9f45b39..7210a363f75 100755 --- a/tools/ci/cibuild.sh +++ b/tools/ci/cibuild.sh @@ -448,7 +448,6 @@ function u-boot-tools { if ! type mkimage &> /dev/null; then case ${os} in Darwin) - rm -f /usr/local/bin/openssl brew install u-boot-tools ;; Linux) @@ -563,6 +562,14 @@ case ${os} in install="arm-gcc-toolchain arm64-gcc-toolchain avr-gcc-toolchain binutils bloaty elf-toolchain gen-romfs gperf kconfig-frontends mips-gcc-toolchain python-tools riscv-gcc-toolchain rust xtensa-esp32-gcc-toolchain u-boot-tools wasi-sdk c-cache" mkdir -p "${tools}"/homebrew export HOMEBREW_CACHE=${tools}/homebrew + # https://github.com/apache/arrow/issues/15025 + rm -f /usr/local/bin/2to3* || : + rm -f /usr/local/bin/idle3* || : + rm -f /usr/local/bin/pydoc3* || : + rm -f /usr/local/bin/python3* || : + rm -f /usr/local/bin/python3-config || : + # same for openssl + rm -f /usr/local/bin/openssl || : ;; Linux) install="arm-clang-toolchain arm-gcc-toolchain arm64-gcc-toolchain avr-gcc-toolchain binutils bloaty clang-tidy gen-romfs gperf kconfig-frontends mips-gcc-toolchain python-tools riscv-gcc-toolchain rust rx-gcc-toolchain sparc-gcc-toolchain xtensa-esp32-gcc-toolchain u-boot-tools wasi-sdk c-cache"