This is an automated email from the ASF dual-hosted git repository. cmcfarlen pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 6200822afcaaa8700945bf95bce2a39ee40f2900 Author: Brian Neradt <[email protected]> AuthorDate: Fri May 3 17:02:18 2024 -0500 Updates for new build_h3_tools for quiche on openssl (#11318) The rockylinux:8 and fedora:40 CI images now both have the updated build_h3_tools run on them. I kept the openssl-quic in /opt for parity with current CI tooling and the boringssl satck is in /opt/h3-tools-boringssl. This updates the presets for these new paths. (cherry picked from commit 4e6a52f5be744d0d472968f2db19f6a1f4105194) --- CMakePresets.json | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 08fbb0ccaf..7272a73b0d 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -147,11 +147,10 @@ "description": "CI Pipeline config for Rocky Linux", "inherits": ["ci"], "cacheVariables": { - "OPENSSL_ROOT_DIR": "/opt/boringssl", - "quiche_ROOT": "/opt/quiche", + "OPENSSL_ROOT_DIR": "/opt/h3-tools-boringssl/boringssl", + "quiche_ROOT": "/opt/h3-tools-boringssl/quiche", "CMAKE_INSTALL_PREFIX": "/tmp/ats-quiche", "opentelemetry_ROOT": "/opt", - "CURL_ROOT": "/opt", "ENABLE_QUICHE": "ON" } }, @@ -188,8 +187,8 @@ "description": "CI Pipeline config for Fedora Linux (quiche build)", "inherits": ["ci"], "cacheVariables": { - "OPENSSL_ROOT_DIR": "/opt/boringssl", - "quiche_ROOT": "/opt/quiche", + "OPENSSL_ROOT_DIR": "/opt/h3-tools-boringssl/boringssl", + "quiche_ROOT": "/opt/h3-tools-boringssl/quiche", "opentelemetry_ROOT": "/opt", "CURL_ROOT": "/opt", "wamr_ROOT": "/opt", @@ -301,13 +300,25 @@ } }, { - "name": "branch-quiche", + "name": "branch-quiche-on-boringssl", + "displayName": "CI branch Quiche", + "inherits": ["branch"], + "cacheVariables": { + "ENABLE_AUTEST": "ON", + "nuraft_ROOT": "/opt/nuraft-boringssl", + "OPENSSL_ROOT_DIR": "/opt/h3-tools-boringssl/boringssl", + "quiche_ROOT": "/opt/h3-tools-boringssl/quiche", + "ENABLE_QUICHE": "ON" + } + }, + { + "name": "branch-quiche-on-openssl", "displayName": "CI branch Quiche", "inherits": ["branch"], "cacheVariables": { "ENABLE_AUTEST": "ON", "nuraft_ROOT": "/opt/nuraft-boringssl", - "OPENSSL_ROOT_DIR": "/opt/boringssl", + "OPENSSL_ROOT_DIR": "/opt/openssl-quic/", "quiche_ROOT": "/opt/quiche", "ENABLE_QUICHE": "ON" }
