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 a786b6f PR rocky: use /opt/yaml-cpp and /opt/libswoc (#330)
a786b6f is described below
commit a786b6f6301a2d9e4029a129e0a042bbe080cda2
Author: Brian Neradt <[email protected]>
AuthorDate: Mon Mar 25 12:08:05 2024 -0500
PR rocky: use /opt/yaml-cpp and /opt/libswoc (#330)
Now that yaml-cpp and libswoc are installed in /opt in the rocky images,
use those install dirs instead of building each of these for each build.
---
jenkins/github/rocky.pipeline | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/jenkins/github/rocky.pipeline b/jenkins/github/rocky.pipeline
index e60e934..27f61e5 100644
--- a/jenkins/github/rocky.pipeline
+++ b/jenkins/github/rocky.pipeline
@@ -67,23 +67,13 @@ pipeline {
if [ -d cmake ]
then
- # Retrieve the libswoc version we use in ATS.
- swoc_version=$(awk '/LIBSWOC_VERSION/ {print $NF;
exit}' lib/swoc/CMakeLists.txt | tr -d '")')
-
- pushd /var/tmp
- git clone
https://github.com/apache/trafficserver-libswoc.git
- pushd trafficserver-libswoc
- git checkout ${swoc_version}
- pipenv install
- pipenv run scons -j`nproc` all
- popd
- popd
-
libswoc_dir=/var/tmp/trafficserver-libswoc/_install/debug_posix-$(uname
-m)_default
-
# Now build ATS, using the external libswoc.
+ libswoc_dir=/opt/libswoc
+ yaml_cpp_dir=/opt/yaml-cpp
PKG_CONFIG_PATH=${libswoc_dir}/lib/pkgconfig \
cmake -B build --preset ci-rocky \
- -DEXTERNAL_LIBSWOC=ON
-Dlibswoc_ROOT=${libswoc_dir}
+ -DEXTERNAL_LIBSWOC=ON
-Dlibswoc_ROOT=${libswoc_dir} \
+ -DEXTERNAL_YAML_CPP=ON
-Dyaml-cpp_ROOT=${yaml_cpp_dir}
cmake --build build -v
cmake --install build
pushd build
