From badf82cfa32c3d48ab3e3771d57cac98a4932fbf Mon Sep 17 00:00:00 2001 From: Ian Duncan <76043277+dr8co@users.noreply.github.com> Date: Fri, 14 Jun 2024 00:54:37 +0300 Subject: [PATCH] Avoid Readline installation on GitHub Actions --- .github/workflows/cmake-multi-platform.yml | 2 +- .github/workflows/cpack-multi-platform.yml | 2 +- scripts/build-functions.sh | 2 +- scripts/prepare-qodana.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 468629b..3dd4c2a 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -30,7 +30,7 @@ jobs: run: | export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE brew update - brew install gcc readline ninja cmake git + brew install gcc ninja cmake git brew reinstall llvm echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"' >> ~/.bash_profile echo 'export PATH="/opt/homebrew/opt/gcc/bin:$PATH"' >> ~/.bash_profile diff --git a/.github/workflows/cpack-multi-platform.yml b/.github/workflows/cpack-multi-platform.yml index 757adf6..bc275f9 100644 --- a/.github/workflows/cpack-multi-platform.yml +++ b/.github/workflows/cpack-multi-platform.yml @@ -30,7 +30,7 @@ jobs: run: | export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE brew update - brew install gcc readline ninja cmake git + brew install gcc ninja cmake git brew reinstall llvm echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"' >> ~/.bash_profile echo 'export PATH="/opt/homebrew/opt/gcc/bin:$PATH"' >> ~/.bash_profile diff --git a/scripts/build-functions.sh b/scripts/build-functions.sh index 95c5062..172956a 100755 --- a/scripts/build-functions.sh +++ b/scripts/build-functions.sh @@ -21,7 +21,7 @@ function install_dependencies() { # add-apt-repository -y ppa:ubuntu-toolchain-r/ppa apt update export NEEDRESTART_SUSPEND=1 - apt install -y wget unzip gcc-14 g++-14 clang-18 lldb-18 lld-18 libc++-18-dev libc++abi-18-dev libllvmlibc-18-dev clang-tools-18 libgcrypt20-dev openssl libreadline8 libreadline-dev libsodium23 libsodium-dev + apt install -y wget unzip gcc-14 g++-14 clang-18 lldb-18 lld-18 libc++-18-dev libc++abi-18-dev libllvmlibc-18-dev clang-tools-18 libgcrypt20-dev openssl libsodium23 libsodium-dev # Install CMake 3.29.3 if dpkg -s "cmake" >/dev/null 2>&1; then diff --git a/scripts/prepare-qodana.sh b/scripts/prepare-qodana.sh index 4eee182..96906cf 100755 --- a/scripts/prepare-qodana.sh +++ b/scripts/prepare-qodana.sh @@ -14,7 +14,7 @@ build_install_gcc_14 # Install dependencies apt remove -y --purge --auto-remove llvm-16-dev clang-16 clang-tidy-16 clang-format-16 lld-16 libc++-16-dev libc++abi-16-dev -apt update && apt install -y software-properties-common wget unzip build-essential openssl libreadline8 libreadline-dev libsodium23 libsodium-dev libgcrypt20-dev +apt update && apt install -y software-properties-common wget unzip build-essential openssl libsodium23 libsodium-dev libgcrypt20-dev wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc add-apt-repository -y "deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-18 main" apt update