diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index d3c8d31e5f..8fcd88cfbe 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -23,16 +23,16 @@ jobs: cpp: 17 asan: off ubsan: off - - os: focal - compiler: clang++ - cpp: 17 - asan: off - ubsan: on - - os: focal - compiler: g++-10 - cpp: 20 - asan: on - ubsan: off + # - os: focal + # compiler: clang++ + # cpp: 17 + # asan: off + # ubsan: on + # - os: focal + # compiler: g++-10 + # cpp: 20 + # asan: on + # ubsan: off - os: jammy compiler: g++ cpp: 20 diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster index 09f667fd8d..e2000d64f9 100644 --- a/.github/workflows/Dockerfile.buster +++ b/.github/workflows/Dockerfile.buster @@ -24,8 +24,14 @@ RUN apt-get update && \ pip3 install -r /tmp/requirements.txt && \ apt-get install -y --no-install-recommends curl-kphp-vk kphp-timelib libuber-h3-dev libfmt-dev libgtest-dev libgmock-dev libre2-dev libpcre3-dev \ libzstd-dev libyaml-cpp-dev libnghttp2-dev zlib1g-dev php7.4-dev libldap-dev libkrb5-dev \ - postgresql postgresql-server-dev-all libnuma-dev composer && \ + postgresql postgresql-server-dev-all libnuma-dev composer perl && \ rm -rf /var/lib/apt/lists/* && \ - update-alternatives --set php /usr/bin/php7.4 + update-alternatives --set php /usr/bin/php7.4 && \ + wget --no-check-certificate https://www.openssl.org/source/openssl-3.0.2.tar.gz && \ + tar -xvzf openssl-3.0.2.tar.gz && \ + cd openssl-3.0.2 && \ + chmod +x ./config && \ + ./config --prefix="/usr/local/" && \ + make -j$(nproc) && make install RUN useradd -ms /bin/bash kitten diff --git a/cmake/init-compilation-flags.cmake b/cmake/init-compilation-flags.cmake index a9c8cf6fe4..57563a906f 100644 --- a/cmake/init-compilation-flags.cmake +++ b/cmake/init-compilation-flags.cmake @@ -32,6 +32,11 @@ else() add_link_options(-fno-lto) endif() +if(NOT APPLE) + set(OPENSSL_ROOT_DIR "/usr/local/" CACHE INTERNAL "") + set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE) + # set(CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX=64) +endif() set(OPENSSL_USE_STATIC_LIBS TRUE) find_package(OpenSSL REQUIRED) include_directories(${OPENSSL_INCLUDE_DIR})