(trafficserver-ci) branch main updated: boringssl nuraft (#335)

[bn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bneradt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git


The following commit(s) were added to refs/heads/main by this push:
     new 53a8fe8  boringssl nuraft (#335)
53a8fe8 is described below

commit 53a8fe8059674c065eef8dc04a9f8db9d6d9293d
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Thu Mar 28 11:36:45 2024 -0500

    boringssl nuraft (#335)
---
 docker/rockylinux8/Dockerfile | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/docker/rockylinux8/Dockerfile b/docker/rockylinux8/Dockerfile
index b19ff78..f100ea9 100644
--- a/docker/rockylinux8/Dockerfile
+++ b/docker/rockylinux8/Dockerfile
@@ -119,11 +119,14 @@ RUN update-crypto-policies --set LEGACY
 # package these, so this has to be built by hand.
 RUN <<EOF
   set -e
+  set -x
 
   git clone https://github.com/eBay/NuRaft.git
   cd NuRaft
+  sed -i 's/-std=c++11/-std=c++17/g' CMakeLists.txt
   ./prepare.sh
 
+  # openssl-quic nuraft
   OPENSSL_PREFIX=/opt/openssl-quic
   if [ -d "${OPENSSL_PREFIX}/lib" ]; then
     OPENSSL_LIB="${OPENSSL_PREFIX}/lib"
@@ -134,13 +137,29 @@ RUN <<EOF
     exit 1
   fi
   cmake \
-    -B build \
+    -B build_openssl \
     -G Ninja \
     -DCMAKE_INSTALL_PREFIX=/opt/ \
     -DOPENSSL_LIBRARY_PATH=${OPENSSL_LIB} \
     -DOPENSSL_INCLUDE_PATH=${OPENSSL_PREFIX}/include
-  cmake --build build
-  cmake --install build
+  cmake --build build_openssl
+  cmake --install build_openssl
+
+  # boringssl nuraft
+  BORINGSSL_PREFIX=/opt/boringssl
+  BORINGSSL_LIB="${BORINGSSL_PREFIX}/lib"
+  if [ -e /etc/redhat-release ]; then
+    BORINGSSL_LIB="${BORINGSSL_PREFIX}/lib64"
+  fi
+  cmake \
+    -B build_boringssl \
+    -G Ninja \
+    -DCMAKE_INSTALL_PREFIX=/opt/nuraft-boringssl \
+    -DOPENSSL_LIBRARY_PATH=${BORINGSSL_LIB} \
+    -DOPENSSL_INCLUDE_PATH=${BORINGSSL_PREFIX}/include
+  cmake --build build_boringssl
+  cmake --install build_boringssl
+
   cd ../
   rm -rf NuRaft
 EOF