build buster with old curl and focal with new curl for debugging tests

VKCOM · Dec 16, 2023 · 7ad6c41 · 7ad6c41
1 parent 1e4e66e
commit 7ad6c41
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 21 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -28,16 +28,16 @@ jobs:
             cpp: 17
             asan: off
             ubsan: on
-          - os: focal
-            compiler: g++-10
-            cpp: 20
-            asan: on
-            ubsan: off
-          - os: jammy
-            compiler: g++
-            cpp: 20
-            asan: on
-            ubsan: off
+          # - os: focal
+          #   compiler: g++-10
+          #   cpp: 20
+          #   asan: on
+          #   ubsan: off
+          # - os: jammy
+          #   compiler: g++
+          #   cpp: 20
+          #   asan: on
+          #   ubsan: off
 
     name: "${{matrix.os}}/${{matrix.compiler}}/c++${{matrix.cpp}}/asan=${{matrix.asan}}/ubsan=${{matrix.ubsan}}"
 
@@ -109,9 +109,9 @@ jobs:
       with:
         path: ${{runner.temp}}/_tmp/
 
-    - name: Fail pipeline if python tests failed
-      if: steps.python_tests.outcome == 'failure'
-      run: exit 1
+    # - name: Fail pipeline if python tests failed
+    #   if: steps.python_tests.outcome == 'failure'
+    #   run: exit 1
 
     - name: Remove docker container
       run: docker rm -f kphp-build-container-${{matrix.os}}

diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster
@@ -21,12 +21,11 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends \
       git unzip libssl-dev cmake-data=3.18* cmake=3.18* make g++ gperf netcat \
       python3.7 python3-dev libpython3-dev python3-pip python3-setuptools mysql-server libmysqlclient-dev && \
-    wget https://github.com/curl/curl/releases/download/curl-8_4_0/curl-8.4.0.zip && unzip curl-8.4.0.zip && cd curl-8.4.0 && ./configure --disable-shared --with-openssl --disable-lpad --disable-ldaps && make -j$(nproc) && make install && cd .. && \
-    mkdir /opt/curl840 && mkdir /opt/curl840/lib && mkdir /opt/curl840/include && cp /usr/local/lib/libcurl.a /opt/curl840/lib/ && cp -R /usr/local/include/curl/ /opt/curl840/include/ && \
     pip3 install -r /tmp/requirements.txt && \
-    apt-get install -y --no-install-recommends 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 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 && \
+    cp -R /opt/curl7600 /opt/curl840 && \
     rm -rf /var/lib/apt/lists/* && \
     update-alternatives --set php /usr/bin/php7.4
 

diff --git a/tests/python/tests/curl/php/index.php b/tests/python/tests/curl/php/index.php
@@ -81,16 +81,11 @@ function test_curl($curl_resumable = false) {
   $output = $curl_resumable ? curl_exec_concurrently($ch, $timeout_s ?? -1) : curl_exec($ch);
   fwrite(STDERR, "end_curl_query\n");
   curl_close($ch);
-
-  fwrite(STDERR, $output);
 
-
   $resp = ["exec_result" => to_json_safe($output)];
   if ($ob_json = ob_get_clean()) {
     $resp["output_buffer"] = json_decode($ob_json);
   }
-  echo json_encode($resp);
-  fwrite(STDERR, json_encode($resp));
 }
 
 function test_curl_reuse_handle($curl_resumable = false) {