Skip to content

Update curl version to 8.4.0 with depencies #970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andarut wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Update curl version to 8.4.0 with depencies #970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fb62cb7
init
andarut Feb 26, 2024
f8e4ac2
link curl depencies to unittests
andarut Feb 26, 2024
631f341
disable gh actions for buster and focal die to old curl
andarut Feb 26, 2024
d235fac
return to curl7600 folder temp
andarut Feb 28, 2024
6baeed1
empty string as response is not valid
andarut Mar 1, 2024
afe9eac
run python curl tests in debug mode
andarut Mar 4, 2024
0520ebd
return
andarut Mar 4, 2024
45fe15c
run specific test with debug
andarut Mar 4, 2024
869de96
try to fix
andarut Mar 4, 2024
ba71d5b
force curl version on jammy
andarut Mar 6, 2024
7a491fa
change tests and bring back in other gh actions
andarut Mar 20, 2024
264f0a1
restore
andarut Mar 21, 2024
a747e6c
Merge branch 'master' into andreylzmw/update-curl
andarut Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/Dockerfile.buster
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ RUN apt-get update && \
apt-get update && \
apt-get install -y --no-install-recommends \
git cmake-data=3.18* cmake=3.18* make g++ gperf netcat \
python3.7 python3-dev libpython3-dev python3-pip python3-setuptools python3-wheel mysql-server libmysqlclient-dev && \
python3.7 python3-dev libpython3-dev python3-pip python3-setuptools mysql-server libmysqlclient-dev libssh2-1 libssh2-1-dev libbrotli-dev libglobus-gssapi-gsi-dev \
libglobus-gssapi-gsi4 libc-ares-dev libkrb5-dev && \
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 \
apt-get install -y --no-install-recommends curl-kphp-vk=20240228.buster.65.build.642 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 && \
rm -rf /var/lib/apt/lists/* && \
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/Dockerfile.focal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ RUN apt-get update && \
apt-get update && \
apt-get install -y --no-install-recommends \
git cmake make clang g++ g++-10 gperf netcat \
python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev && \
python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev libssh2-1 libssh2-1-dev libbrotli-dev libglobus-gssapi-gsi-dev \
libglobus-gssapi-gsi4 libc-ares-dev libkrb5-dev && \
python3.7 -m pip install pip && python3.7 -m pip 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 \
apt-get install -y --no-install-recommends curl-kphp-vk=20240228.focal.60.build.642 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 unzip && \
rm -rf /var/lib/apt/lists/*
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/Dockerfile.jammy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ RUN apt update && \
apt update && \
apt install -y --no-install-recommends \
git cmake make g++ lld gperf netcat \
python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev && \
python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev libssh2-1 libssh2-1-dev libbrotli-dev libglobus-gssapi-gsi-dev \
libglobus-gssapi-gsi4 libc-ares-dev libkrb5-dev && \
python3.7 -m pip install pip && python3.7 -m pip install -r /tmp/requirements.txt && \
apt install -y --no-install-recommends curl-kphp-vk kphp-timelib libuber-h3-dev libfmt-dev libgtest-dev libgmock-dev libre2-dev libpcre3-dev \
apt install -y --no-install-recommends curl-kphp-vk=20240228.jammy.62.build.642 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 libnuma-dev unzip \
libldap-dev libkrb5-dev postgresql postgresql-server-dev-all && \
rm -rf /var/lib/apt/lists/*
Expand Down
1 change: 1 addition & 0 deletions compiler/compiler-settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ void append_curl(std::string &cxx_flags, std::string &ld_flags) noexcept {
const std::string curl_dir = "/opt/curl7600";
cxx_flags += " -I" + curl_dir + "/include/";
ld_flags += " " + curl_dir + "/lib/libcurl.a";
ld_flags += " -lssh2 -lcares -lbrotlicommon -lbrotlidec";
#endif
}
}
Expand Down
2 changes: 1 addition & 1 deletion runtime/runtime.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ target_link_libraries(kphp-full-runtime PUBLIC ${RUNTIME_LIBS})
set_target_properties(kphp-full-runtime PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${OBJS_DIR})

prepare_cross_platform_libs(RUNTIME_LINK_TEST_LIBS pcre nghttp2 kphp-timelib)
set(RUNTIME_LINK_TEST_LIBS vk::flex_data_static ${CURL_LIB} OpenSSL::SSL ${NUMA_LIB} ${RUNTIME_LINK_TEST_LIBS} ${EPOLL_SHIM_LIB} ${ICONV_LIB} ${RT_LIB})
set(RUNTIME_LINK_TEST_LIBS vk::flex_data_static ${CURL_LIB} OpenSSL::SSL ${NUMA_LIB} ${RUNTIME_LINK_TEST_LIBS} ${EPOLL_SHIM_LIB} ${ICONV_LIB} ${RT_LIB} cares brotlicommon brotlidec ssh2)

if (PDO_DRIVER_MYSQL)
list(APPEND RUNTIME_LINK_TEST_LIBS mysqlclient)
Expand Down
4 changes: 2 additions & 2 deletions tests/python/tests/curl/test_curl_resumable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def test_curl_resumable_timeout(self):

def test_curl_resumable_nonexistent_url(self):
self.assertEqual(self._curl_request("nonexistent_url"), {
"exec_result": False
"exec_result": ''
})

def test_curl_resumable_connection_only_success(self):
Expand All @@ -63,5 +63,5 @@ def test_curl_resumable_connection_only_success(self):

def test_curl_resumable_connection_only_fail(self):
self.assertEqual(self._curl_request("nonexistent_url", connect_only=True), {
"exec_result": False
"exec_result": ''
})