diff --git a/.ci/.env b/.ci/.env index 46e9d13..8730f5d 100644 --- a/.ci/.env +++ b/.ci/.env @@ -1,10 +1,14 @@ +GCC_VERSION=14 LINUX_PACKAGES="make \ autoconf \ automake \ build-essential \ cargo \ curl \ + gcc-$GCC_VERSION \ + g++-$GCC_VERSION \ git \ + golang-go \ libtool \ nasm \ ninja-build \ @@ -23,6 +27,7 @@ MACOS_PACKAGES="make \ rust \ curl \ git \ + go \ libtool \ nasm \ ninja \ diff --git a/.ci/scripts/init.sh b/.ci/scripts/init.sh index 58d7b3f..9c19d2b 100755 --- a/.ci/scripts/init.sh +++ b/.ci/scripts/init.sh @@ -13,6 +13,8 @@ main() { linux_deb) echo "=== Detected Linux system with apt" apt update && apt install -y $LINUX_PACKAGES + update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-$GCC_VERSION 90 + update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-$GCC_VERSION 90 if [ -f "$HOME/.cargo/env" ]; then source "$HOME/.cargo/env" fi diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c32f62..fdde7bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ find_package(prometheus-cpp CONFIG REQUIRED) find_package(Protobuf CONFIG REQUIRED) find_package(qtils CONFIG REQUIRED) find_package(RocksDB CONFIG REQUIRED) -find_package(snappy CONFIG REQUIRED) +find_package(Snappy CONFIG REQUIRED) find_package(soralog CONFIG REQUIRED) find_package(sszpp CONFIG REQUIRED) find_package(yaml-cpp CONFIG REQUIRED) diff --git a/src/injector/CMakeLists.txt b/src/injector/CMakeLists.txt index 8353471..3089c88 100644 --- a/src/injector/CMakeLists.txt +++ b/src/injector/CMakeLists.txt @@ -23,4 +23,5 @@ target_link_libraries(node_injector se_async storage timeline + p2p::p2p_key_validator ) diff --git a/vcpkg-overlay/leanp2p/portfile.cmake b/vcpkg-overlay/leanp2p/portfile.cmake index da27cd1..b875835 100644 --- a/vcpkg-overlay/leanp2p/portfile.cmake +++ b/vcpkg-overlay/leanp2p/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO qdrvm/leanp2p - REF 29f1937bf74f2d9dfddcc3774d670240d131b9d4 - SHA512 66a4a9e329aadb031dc7274aa73c358b4fb2372af7d0a86043584571a65e7951454f78c7a3955cbe05dda9fbac3587a1108b3bdf63390e130d5ea7e806e59499 + REF 9dcfed625f1e6c51e8d0f986064884477dc44390 + SHA512 8d0470ca47753ad7c5f5af2937f662229e7a74829e24533e88213dabb8a3f3ae8524f36f690a72899af8fcfbebc98729348c09a10e7535ef1473d8697d25a652 ) vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") vcpkg_cmake_install()