diff options
| -rwxr-xr-x | scripts/zuul/before_script.sh | 10 | ||||
| -rw-r--r-- | zuul.d/jobs.yaml | 39 |
2 files changed, 2 insertions, 47 deletions
diff --git a/scripts/zuul/before_script.sh b/scripts/zuul/before_script.sh index 56f3d6c21..1c19f820b 100755 --- a/scripts/zuul/before_script.sh +++ b/scripts/zuul/before_script.sh @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -96,14 +96,6 @@ if [ "$TRAVIS_OS_NAME" = linux -a "$OPENSSL3" ]; then make install_sw fi -if [ "$TRAVIS_OS_NAME" = linux -a "$MBEDTLS3" ]; then - cd $HOME - git clone --depth=1 -b v3.0.0 https://github.com/ARMmbed/mbedtls - cd mbedtls - make - make DESTDIR=$HOME/mbedtls3 install -fi - if [ "$TRAVIS_OS_NAME" = linux -a "$LIBRESSL" ]; then cd $HOME git clone --depth=1 -b v3.1.4 https://github.com/libressl-portable/portable.git libressl-git diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index aa034d7b5..e13bdc4e1 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2021, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 2021 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -238,24 +238,6 @@ TFLAGS: https ftps - job: - name: curl-debug-mbedtls3 - parent: curl-base - vars: - curl_apt_packages: - - libpsl-dev - - libbrotli-dev - - libzstd-dev - curl_env: - CC: gcc-8 - CXX: g++-8 - T: debug - MBEDTLS3: "yes" - C: >- - --with-mbedtls={{ ansible_user_dir }}/mbedtls3 - LD_LIBRARY_PATH: "{{ ansible_user_dir }}/mbedtls3/lib:/usr/local/lib" - TFLAGS: https ftps - -- job: name: curl-debug-mesalink parent: curl-base vars: @@ -305,23 +287,6 @@ --disable-alt-svc - job: - name: curl-debug-clang-with-mbedtls - parent: curl-base - vars: - curl_apt_packages: - - clang-9 - - libpsl-dev - - libbrotli-dev - - libzstd-dev - - libmbedtls-dev - curl_env: - CC: clang-9 - CXX: clang++-9 - T: debug - C: >- - --with-mbedtls - -- job: name: curl-debug-clang-with-gnutls parent: curl-base vars: @@ -554,11 +519,9 @@ - curl-novalgrind-ngtcp2-with-openssl - curl-novalgrind-ngtcp2-gnutls - curl-debug-openssl3 - - curl-debug-mbedtls3 - curl-debug-mesalink - curl-debug-clang-with-openssl - curl-debug-clang-disable-alt-svc-with-openssl - - curl-debug-clang-with-mbedtls - curl-debug-clang-with-gnutls - curl-debug-clang-with-nss - curl-iconv-with-openssl |